Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 01:44:22 +0000 (02:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 01:44:22 +0000 (02:44 +0100)
commit1667152a9c1af2ca978f005bb095e479ef7a3107
treecca08cf9c559a88bc6672b16a6889ca294482e68
parentba4bcb191aa8b5fa66131544bf9ebf1f17ff7d9a
parentacb571c89a065d943163c11efb46de35774f1909
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>
Changelog
ffmpeg_opt.c
libavcodec/version.h