diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 03:26:18 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-06 03:35:05 +0400 |
| commit | 927696aab258c7184ceac9765a305b5f91eef8dc (patch) | |
| tree | 309d7998698b88ac531d8bc6967cedd22388063f /tests/fate | |
| parent | a3be0c334e8ba7e447a734aa2be862815e5daf85 (diff) | |
| parent | 5a0bccd2810d22b1dd515e650911212a310300de (diff) | |
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 'tests/fate')
| -rw-r--r-- | tests/fate/xvid.mak | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/fate/xvid.mak b/tests/fate/xvid.mak index 2b593b59fb..68f01b5827 100644 --- a/tests/fate/xvid.mak +++ b/tests/fate/xvid.mak @@ -1,6 +1,9 @@ -fate-xvid-custom-matrix: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 +fate-xvid-custom-matrix: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 +fate-xvid-idctmmx: CMD = framemd5 -flags +bitexact -cpuflags all -i $(TARGET_SAMPLES)/mpeg4/xvid_vlc_trac7411.h263 FATE_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix +FATE_XVID-$(filter $(HAVE_MMX_INLINE), $(call DEMDEC, M4V, MPEG4)) += fate-xvid-idctmmx + FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) fate-xvid: $(FATE_XVID-yes) |