diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
| commit | 3c8493074bc43aced247a34d6b981e6f9acde0f1 (patch) | |
| tree | 99b7984ed8e49d397c4cb3dab184454e26e122f1 /tests/fate.mak | |
| parent | b0efaee6c1a07b4e7575bf523542ce846202b6e2 (diff) | |
| parent | 1500be13f204acb7e74dac4325ef0052576fa2a9 (diff) | |
| download | ffmpeg-3c8493074bc43aced247a34d6b981e6f9acde0f1.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
dsputil: allow to skip drawing of top/bottom edges.
Split fate-psx-str-v3 into a video-only and audio-only test.
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate.mak')
| -rw-r--r-- | tests/fate.mak | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/fate.mak b/tests/fate.mak index 21158fc13c..0e3331178b 100644 --- a/tests/fate.mak +++ b/tests/fate.mak @@ -204,8 +204,10 @@ FATE_TESTS += fate-pcm_dvd fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn FATE_TESTS += fate-psx-str fate-psx-str: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -FATE_TESTS += fate-psx-str-v3 -fate-psx-str-v3: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str +FATE_TESTS += fate-psx-str-v3-mdec +fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -an +FATE_TESTS += fate-psx-str-v3-adpcm_xa +fate-psx-str-v3-adpcm_xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn FATE_TESTS += fate-ptx fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 FATE_TESTS += fate-pva-demux |