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)
commit047c5e177ae0cffdb1f3648a31a96784d2cf94c0
tree49932da490caa2da69ff904c25991f151c1b029c
parent02a6b06d9ea0009f058b0f43c98f640f63f1359a
parent98cec5c84feff34e04428de4a86836a83657ae5e
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@gmx.at>
libavcodec/ratecontrol.h