diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:55:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:09:38 +0200 |
| commit | 5b58d79a99658200ee5562999b16b5a8fa729b22 (patch) | |
| tree | bd10ed2708d7485f5156c4e67f8325bcff5bd999 /tests | |
| parent | 5db23c07a3f76d31e8e3178f8bacb68289bba62b (diff) | |
| parent | 7a1d6ddd2c6b2d66fbc1afa584cf506930a26453 (diff) | |
| download | ffmpeg-streaming-5b58d79a99658200ee5562999b16b5a8fa729b22.zip ffmpeg-streaming-5b58d79a99658200ee5562999b16b5a8fa729b22.tar.gz | |
Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/xvid.mak | 5 | ||||
| -rw-r--r-- | tests/ref/fate/xvid-idct (renamed from tests/ref/fate/xvid-idctmmx) | 0 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/fate/xvid.mak b/tests/fate/xvid.mak index 68f01b5..877b2a1 100644 --- a/tests/fate/xvid.mak +++ b/tests/fate/xvid.mak @@ -1,8 +1,7 @@ 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-idct: 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_XVID-$(call DEMDEC, M4V, MPEG4) += fate-xvid-custom-matrix fate-xvid-idct FATE_SAMPLES_AVCONV += $(FATE_XVID-yes) diff --git a/tests/ref/fate/xvid-idctmmx b/tests/ref/fate/xvid-idct index 2fc93ee..2fc93ee 100644 --- a/tests/ref/fate/xvid-idctmmx +++ b/tests/ref/fate/xvid-idct |
