fate: Introduce ENCMUX macro for tests that require encoders and a muxer

diff --git a/tests/Makefile b/tests/Makefile
index be97d0c..93eb548 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -34,6 +34,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
                          $(firstword $(3))_MUXER   $(lastword $(3))_DEMUXER)
 
 DEMDEC  = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
+ENCMUX  = $(call ALLYES, $(2:%=%_ENCODER) $(1)_MUXER)
 
 include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak

diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 4401423..7ef68ad 100644 (file)
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -28,7 +28,7 @@ FATE_LAVF-$(call ENCDEC,  PGM,                   IMAGE2PIPE)         += pgmpipe
 FATE_LAVF-$(call ENCDEC,  PNG,                   IMAGE2)             += png
 FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2)             += ppm
 FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2PIPE)         += ppmpipe
-FATE_LAVF-$(call ALLYES,  RV10_ENCODER AC3_FIXED_ENCODER RM_MUXER)   += rm
+FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
 FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
 FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox

diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 23bf676..7be7db9 100644 (file)
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -100,7 +100,7 @@ FATE_SEEK-$(call ENCDEC,  PGM,                   IMAGE2)      += image_pgm
 FATE_SEEK-$(call ENCDEC,  PGM,                   IMAGE2PIPE)  += pgmpipe_pgm
 FATE_SEEK-$(call ENCDEC,  PPM,                   IMAGE2)      += image_ppm
 FATE_SEEK-$(call ENCDEC,  PPM,                   IMAGE2PIPE)  += ppmpipe_ppm
-FATE_SEEK-$(call ALLYES,  RV10_ENCODER AC3_FIXED_ENCODER RM_MUXER) += lavf_rm
+FATE_SEEK-$(call ENCMUX,  RV10 AC3_FIXED,        RM)          += lavf_rm
 FATE_SEEK-$(call ENCDEC,  SGI,                   IMAGE2)      += image_sgi
 FATE_SEEK-$(call ENCDEC,  FLV,                   SWF)         += lavf_swf
 FATE_SEEK-$(call ENCDEC,  TARGA,                 IMAGE2)      += image_tga