summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-11-28 11:45:17 +0100
committerDiego Biurrun <diego@biurrun.de>2012-11-28 14:45:28 +0100
commit1f3f896564501c23b44fcf605567c78ce066b539 (patch)
tree832cfe7f77efefe08636dde4b56e7a18686f6944 /tests
parent5116ac7774242a9e3fb661e8f30132b47f7720fd (diff)
downloadffmpeg-streaming-1f3f896564501c23b44fcf605567c78ce066b539.zip
ffmpeg-streaming-1f3f896564501c23b44fcf605567c78ce066b539.tar.gz
fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/prores.mak2
-rw-r--r--tests/fate/qtrle.mak2
-rw-r--r--tests/fate/utvideo.mak4
-rw-r--r--tests/fate/vorbis.mak2
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak
index 1d76fff..9c1a1b1 100644
--- a/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
@@ -4,7 +4,7 @@ FATE_PRORES = fate-prores-422 \
fate-prores-422_proxy \
fate-prores-alpha \
-FATE_SAMPLES_AVCONV += $(FATE_PRORES)
+FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
fate-prores: $(FATE_PRORES)
fate-prores-422: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak
index 3850a80..d8a6ecf 100644
--- a/tests/fate/qtrle.mak
+++ b/tests/fate/qtrle.mak
@@ -19,5 +19,5 @@ fate-qtrle-24bit: CMD = framecrc -i $(SAMPLES)/qtrle/aletrek-rle.mov
FATE_QTRLE += fate-qtrle-32bit
fate-qtrle-32bit: CMD = framecrc -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24
-FATE_SAMPLES_AVCONV += $(FATE_QTRLE)
+FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE)
fate-qtrle: $(FATE_QTRLE)
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak
index 7042163..004d8e0 100644
--- a/tests/fate/utvideo.mak
+++ b/tests/fate/utvideo.mak
@@ -25,7 +25,7 @@ fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_le
FATE_UTVIDEO += fate-utvideo_yuv422_median
fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi
-FATE_SAMPLES_AVCONV += $(FATE_UTVIDEO)
+FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO)
fate-utvideo: $(FATE_UTVIDEO)
fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -f avi -sws_flags +accurate_rnd+bitexact ${OPTS}
@@ -68,5 +68,5 @@ fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median
$(FATE_UTVIDEOENC): tests/vsynth1/00.pgm
-FATE_AVCONV += $(FATE_UTVIDEOENC)
+FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC)
fate-utvideoenc: $(FATE_UTVIDEOENC)
diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak
index 774cb35..39a9724 100644
--- a/tests/fate/vorbis.mak
+++ b/tests/fate/vorbis.mak
@@ -80,6 +80,6 @@ FATE_VORBIS += fate-vorbis-20
fate-vorbis-20: CMD = pcm -i $(SAMPLES)/vorbis/6.ogg
fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm
-FATE_SAMPLES_AVCONV += $(FATE_VORBIS)
+FATE_SAMPLES_AVCONV-$(call DEMDEC, OGG, VORBIS) += $(FATE_VORBIS)
fate-vorbis: $(FATE_VORBIS)
$(FATE_VORBIS): CMP = oneoff
OpenPOWER on IntegriCloud