diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:51:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-20 02:51:35 +0100 |
| commit | 7e90053822f43e5dfc55d6cdac02f993068f4533 (patch) | |
| tree | 43ce8bd9cd7f85a366b6d86be0135605c6090d9f /tests/fate/subtitles.mak | |
| parent | 1667152a9c1af2ca978f005bb095e479ef7a3107 (diff) | |
| parent | 45635885e44cb7adce35ac19279d48c1ef6c4779 (diff) | |
| download | ffmpeg-7e90053822f43e5dfc55d6cdac02f993068f4533.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: increase edge_emu_buffer size for VC1
lavc: merge latest x86inc.asm fixes with x264
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/subtitles.mak')
0 files changed, 0 insertions, 0 deletions