diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:25:37 +0200 |
| commit | 1f5e5d2205df568f86371660b0991ec7087e94e6 (patch) | |
| tree | de4e14688195143baab7988797d3329904a92ee4 /tests/fate/wma.mak | |
| parent | e755c8ac462e85e6c3de4f0207dc6bb5c86409cf (diff) | |
| parent | ba13606ca6adbc74b4db4a72b0769397d6408791 (diff) | |
| download | ffmpeg-1f5e5d2205df568f86371660b0991ec7087e94e6.tar.gz | |
Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
fate: Add a --target-samples path parameter
Conflicts:
configure
tests/fate/audio.mak
tests/fate/cover-art.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/filter-video.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/pcm.mak
tests/fate/prores.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vpx.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/wma.mak')
| -rw-r--r-- | tests/fate/wma.mak | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index b9a856ca7c..1b8c5f971c 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -1,13 +1,13 @@ FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-2ch -fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma +fate-wmapro-2ch: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/Beethovens_9th-1_small.wma fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-5.1 -fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma +fate-wmapro-5.1: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm FATE_WMAPRO-$(call DEMDEC, MOV, WMAPRO) += fate-wmapro-ism -fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn +fate-wmapro-ism: CMD = pcm -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -vn fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm $(FATE_WMAPRO-yes): CMP = oneoff @@ -16,17 +16,17 @@ FATE_SAMPLES_AVCONV += $(FATE_WMAPRO-yes) fate-wmapro: $(FATE_WMAPRO-yes) FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-7k -fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma +fate-wmavoice-7k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-7K.wma fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm fate-wmavoice-7k: FUZZ = 3 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-11k -fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma +fate-wmavoice-11k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-11K.wma fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm fate-wmavoice-11k: FUZZ = 3 FATE_WMAVOICE-$(call DEMDEC, ASF, WMAVOICE) += fate-wmavoice-19k -fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma +fate-wmavoice-19k: CMD = pcm -i $(TARGET_SAMPLES)/wmavoice/streaming_CBR-19K.wma fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm fate-wmavoice-19k: FUZZ = 3 @@ -36,13 +36,13 @@ FATE_SAMPLES_AVCONV += $(FATE_WMAVOICE-yes) fate-wmavoice: $(FATE_WMAVOICE-yes) FATE_WMA_ENCODE-$(call ENCDEC, WMAV1, ASF) += fate-wmav1-encode -fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav1 -b:a 128k +fate-wmav1-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav1 -b:a 128k fate-wmav1-encode: CMP_SHIFT = -8192 fate-wmav1-encode: CMP_TARGET = 291.06 fate-wmav1-encode: SIZE_TOLERANCE = 4632 FATE_WMA_ENCODE-$(call ENCDEC, WMAV2, ASF) += fate-wmav2-encode -fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(REF) -c:a wmav2 -b:a 128k +fate-wmav2-encode: CMD = enc_dec_pcm asf wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a wmav2 -b:a 128k fate-wmav2-encode: CMP_SHIFT = -8192 fate-wmav2-encode: CMP_TARGET = 258.32 fate-wmav2-encode: SIZE_TOLERANCE = 4632 |