mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
927696aab2
* 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>