[FFmpeg-cvslog] Merge commit 'acb571c89a065d943163c11efb46de35774f1909'

Michael Niedermayer git at videolan.org
Thu Dec 20 02:50:56 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 20 02:44:22 2012 +0100| [1667152a9c1af2ca978f005bb095e479ef7a3107] | committer: Michael Niedermayer

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list