diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-20 02:14:54 +0100 |
| commit | 48706f41e1a17e04b0aa09852eff021833708233 (patch) | |
| tree | d33af96fedd771264c6717eacd2d54800bc05aff /tests/fate/wma.mak | |
| parent | 9d35fa43eea1c0646a5f3e4ba537d58f574b9ca7 (diff) | |
| parent | a85ce653fb14ae968419453fabf1ffe10d1f15df (diff) | |
| download | ffmpeg-48706f41e1a17e04b0aa09852eff021833708233.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12: check for available bits to avoid an infinite loop
fate: add some shorthands to run groups of tests
fate: Give some tests more sensible names.
cosmetics: Rename ffsink to avsink.
Conflicts:
avconv.c
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/dpcm.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/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/wma.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/wma.mak')
| -rw-r--r-- | tests/fate/wma.mak | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak index c57ffe54c6..3d849ea146 100644 --- a/tests/fate/wma.mak +++ b/tests/fate/wma.mak @@ -1,35 +1,38 @@ -FATE_WMA += fate-wmapro-2ch +FATE_WMAPRO += fate-wmapro-2ch fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma fate-wmapro-2ch: CMP = oneoff fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm -FATE_WMA += fate-wmapro-5.1 +FATE_WMAPRO += fate-wmapro-5.1 fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma fate-wmapro-5.1: CMP = oneoff fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm -FATE_WMA += fate-wmapro-ism +FATE_WMAPRO += fate-wmapro-ism fate-wmapro-ism: CMD = pcm -i $(SAMPLES)/isom/vc1-wmapro.ism -vn fate-wmapro-ism: CMP = oneoff fate-wmapro-ism: REF = $(SAMPLES)/isom/vc1-wmapro.pcm -FATE_WMA += fate-wmavoice-7k +FATE_TESTS += $(FATE_WMAPRO) +fate-wmapro: $(FATE_WMAPRO) + +FATE_WMAVOICE += fate-wmavoice-7k fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma fate-wmavoice-7k: CMP = stddev fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm fate-wmavoice-7k: FUZZ = 3 -FATE_WMA += fate-wmavoice-11k +FATE_WMAVOICE += fate-wmavoice-11k fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma fate-wmavoice-11k: CMP = stddev fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm fate-wmavoice-11k: FUZZ = 3 -FATE_WMA += fate-wmavoice-19k +FATE_WMAVOICE += fate-wmavoice-19k fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma fate-wmavoice-19k: CMP = stddev fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm fate-wmavoice-19k: FUZZ = 3 -FATE_TESTS += $(FATE_WMA) -fate-wma: $(FATE_WMA) +FATE_TESTS += $(FATE_WMAVOICE) +fate-wmavoice: $(FATE_WMAVOICE) |