Michael Niedermayer 1667152a9c Merge commit 'acb571c89a065d943163c11efb46de35774f1909' ...

* commit 'acb571c89a065d943163c11efb46de35774f1909':
  avcodec: bump minor for adaptive h264 frame-mt
  avconv: pass the actually selected decoder to filter_codec_opts().

Conflicts:
	Changelog
	ffmpeg_opt.c
	libavcodec/version.h

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

2012-12-20 02:44:22 +01:00

3.6 KiB

Raw Blame History

View Raw