Merge commit '98cec5c84feff34e04428de4a86836a83657ae5e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 00:47:39 +0000 (01:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 00:47:39 +0000 (01:47 +0100)
* 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@gmx.at>
1  2 
libavcodec/ratecontrol.h

Simple merge