diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:38:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:43:02 +0200 |
| commit | 9e7f1474dd5f3d33794b46e9a6555031c5165023 (patch) | |
| tree | e2bb576a4701f7399fbf185ea638c63690ce8a14 | |
| parent | 5297003aa7a06e0223f3842b810d9fb10f67789d (diff) | |
| parent | a027d2a8731f7c95dbb57be470160f0f94d6c97d (diff) | |
| download | ffmpeg-9e7f1474dd5f3d33794b46e9a6555031c5165023.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add tests for SANM and VIMA
Conflicts:
tests/fate/video.mak
tests/ref/fate/sanm
See: 4cdff582068b968f9c2f14ce4bd5a68be069ce11
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/adpcm.mak | 3 | ||||
| -rw-r--r-- | tests/fate/audio.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/adpcm-vima (renamed from tests/ref/fate/vima) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak index 6b1dd3cb36..b64920d4fe 100644 --- a/tests/fate/adpcm.mak +++ b/tests/fate/adpcm.mak @@ -82,6 +82,9 @@ fate-adpcm_ms-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L FATE_ADPCM-$(call DEMDEC, THP, ADPCM_THP) += fate-adpcm-thp fate-adpcm-thp: CMD = framecrc -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -vn +FATE_ADPCM-$(call DEMDEC, SMUSH, ADPCM_VIMA) += fate-adpcm-vima +fate-adpcm-vima: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -vn + FATE_ADPCM-$(call DEMDEC, STR, ADPCM_XA) += fate-adpcm-xa fate-adpcm-xa: CMD = framecrc -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -vn diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 6b5d1a96d3..20ef04289e 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -52,9 +52,6 @@ fate-sierra-vmd-audio: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -vn FATE_SAMPLES_AUDIO-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio fate-smacker-audio: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -vn -FATE_SAMPLES_AUDIO-$(call DEMDEC, SMUSH, VIMA) += fate-vima -fate-vima: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -vn - FATE_SAMPLES_AUDIO-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd fate-ws_snd: CMD = md5 -i $(TARGET_SAMPLES)/vqa/ws_snd.vqa -f s16le diff --git a/tests/ref/fate/vima b/tests/ref/fate/adpcm-vima index 6984c5dfc6..6984c5dfc6 100644 --- a/tests/ref/fate/vima +++ b/tests/ref/fate/adpcm-vima |