diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:44:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:44:22 +0100 |
| commit | 1667152a9c1af2ca978f005bb095e479ef7a3107 (patch) | |
| tree | cca08cf9c559a88bc6672b16a6889ca294482e68 /tests | |
| parent | ba4bcb191aa8b5fa66131544bf9ebf1f17ff7d9a (diff) | |
| parent | acb571c89a065d943163c11efb46de35774f1909 (diff) | |
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>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions