diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 00:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-20 10:21:52 +0200 |
| commit | 31f3c94760b42e16e998dcc0b34e677d1aa431bc (patch) | |
| tree | 8a6033e5163bd038ea8ba5629233e7567e57d4ae /tests/fate/audio.mak | |
| parent | d1384c00d4882712816612d82289be240c508779 (diff) | |
| parent | 63dcd16d567862d94fe4b178e47f440e8ad6a2c9 (diff) | |
| download | ffmpeg-31f3c94760b42e16e998dcc0b34e677d1aa431bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fix dependencies on SAMPLES being set
fate: remove unnecessary libavfilter dependency
Conflicts:
ffmpeg.c
tests/Makefile
tests/fate/aac.mak
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/ea.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/probe.mak
tests/fate/qt.mak
tests/fate/real.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/fate/voice.mak
tests/fate/vqf.mak
tests/ref/fate/idroq-video-encode
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/audio.mak')
| -rw-r--r-- | tests/fate/audio.mak | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 19d2398dd7..33356da3c6 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -10,31 +10,31 @@ fate-binkaudio-rdft: CMP = oneoff fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm fate-binkaudio-rdft: FUZZ = 2 -FATE_AUDIO += $(FATE_BINKAUDIO) +FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO) fate-binkaudio: $(FATE_BINKAUDIO) -FATE_AUDIO += fate-bmv-audio +FATE_SAMPLES_AUDIO += fate-bmv-audio fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn -FATE_AUDIO += fate-delphine-cin-audio +FATE_SAMPLES_AUDIO += fate-delphine-cin-audio fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn -FATE_AUDIO += fate-dts +FATE_SAMPLES_AUDIO += fate-dts fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts fate-dts: CMP = oneoff fate-dts: REF = $(SAMPLES)/dts/dts.pcm -FATE_AUDIO += fate-imc +FATE_SAMPLES_AUDIO += fate-imc fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi fate-imc: CMP = oneoff fate-imc: REF = $(SAMPLES)/imc/imc.pcm -FATE_AUDIO += fate-nellymoser +FATE_SAMPLES_AUDIO += fate-nellymoser fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm -FATE_AUDIO += fate-nellymoser-aref-encode +FATE_SAMPLES_AUDIO += fate-nellymoser-aref-encode fate-nellymoser-aref-encode: $(AREF) fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser fate-nellymoser-aref-encode: CMP = stddev @@ -45,14 +45,14 @@ fate-nellymoser-aref-encode: CMP_SHIFT = -1172 fate-nellymoser-aref-encode: CMP_TARGET = 10216 fate-nellymoser-aref-encode: SIZE_TOLERANCE = 1300 -FATE_AUDIO += fate-sierra-vmd-audio +FATE_SAMPLES_AUDIO += fate-sierra-vmd-audio fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn -FATE_AUDIO += fate-smacker-audio +FATE_SAMPLES_AUDIO += fate-smacker-audio fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn -FATE_AUDIO += fate-ws_snd +FATE_SAMPLES_AUDIO += fate-ws_snd fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le -FATE_FFMPEG += $(FATE_AUDIO) -fate-audio: $(FATE_AUDIO) +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_AUDIO) +fate-audio: $(FATE_SAMPLES_AUDIO) |