aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/vqf.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-19 13:47:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-19 13:47:47 +0200
commit93f244e3abc3d75a797535a8da890bb1f9932433 (patch)
tree8278955c098813fafdf58a5b4011b13f25b7ee03 /tests/fate/vqf.mak
parentb0554fec0470bf59b0582c80697d28646e37b854 (diff)
parent0af1fe845a9d7112da0a58d33a4fc81fe7c47e95 (diff)
downloadffmpeg-93f244e3abc3d75a797535a8da890bb1f9932433.tar.gz
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95': avformat: Fix references to the removed function av_write_header in comments changelog: Mention the MSVC DLL support fate: add dependencies for misc microsoft codecs fate-twinvq: add dependencies fate-mpc: add dependencies fate-indeo: add dependencies fate-als: add dependencies fate: dependencies for demux tests Conflicts: Changelog tests/Makefile tests/fate/demux.mak tests/fate/microsoft.mak tests/fate/mpc.mak tests/fate/vqf.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vqf.mak')
-rw-r--r--tests/fate/vqf.mak6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
index b8a91c1661..67ee61fb9c 100644
--- a/tests/fate/vqf.mak
+++ b/tests/fate/vqf.mak
@@ -1,10 +1,12 @@
-FATE_VQF += fate-twinvq
+FATE_VQF-$(call DEMDEC, VQF, TWINVQ) += fate-twinvq
fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf
fate-twinvq: CMP = oneoff
fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
-FATE_VQF += fate-vqf-demux
+FATE_VQF-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux
fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
+FATE_VQF += $(FATE_VQF-yes)
+
FATE_SAMPLES_FFMPEG += $(FATE_VQF)
fate-vqf: $(FATE_VQF)