diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 00:26:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 00:35:05 +0100 |
| commit | 927696aab258c7184ceac9765a305b5f91eef8dc (patch) | |
| tree | 309d7998698b88ac531d8bc6967cedd22388063f /ffmpeg_opt.c | |
| parent | a3be0c334e8ba7e447a734aa2be862815e5daf85 (diff) | |
| parent | 5a0bccd2810d22b1dd515e650911212a310300de (diff) | |
| download | ffmpeg-927696aab258c7184ceac9765a305b5f91eef8dc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: force the simple idct for xvid custom matrix test
Conflicts:
tests/fate/xvid.mak
tests/ref/fate/xvid-custom-matrix
See: ef034cbf185e1938000a117bd16aa6b33046f479
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions