Files
ffmpeg/libavcodec/ratecontrol.h
Michael Niedermayer 047c5e177a 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>
2013-03-13 01:47:39 +01:00

3.3 KiB