diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-20 15:40:15 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-10-20 21:10:21 +0200 |
| commit | 8860878291579927bfbb2cd561b410d7419eaae4 (patch) | |
| tree | cd4126ea005c0520077b6611ac57ef30363cc71c | |
| parent | 6cfca5b6ae5a2212082408ee751facd37810d606 (diff) | |
| download | ffmpeg-8860878291579927bfbb2cd561b410d7419eaae4.tar.gz | |
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/fate/avformat.mak | 2 | ||||
| -rw-r--r-- | tests/fate/seek.mak | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/tests/Makefile b/tests/Makefile index be97d0cac3..93eb54801b 100644 --- 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 44014237d2..7ef68ad753 100644 --- 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 23bf676054..7be7db92aa 100644 --- 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 |