[FFmpeg-cvslog] Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 01:47:39 2013 +0100| [047c5e177ae0cffdb1f3648a31a96784d2cf94c0] | committer: Michael Niedermayer

Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e'

* commit '98cec5c84feff34e04428de4a86836a83657ae5e':
  ratecontrol: remove an unused variable
  vorbisdec: do not leak the first frame.
  vf_pad: fix a & instead of && typo

Conflicts:
	libavfilter/vf_pad.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=047c5e177ae0cffdb1f3648a31a96784d2cf94c0
---