diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 16:32:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 17:01:01 +0200 |
| commit | 0e097616865ea8a1fa8e63a451a4921336660283 (patch) | |
| tree | 05e40d896f65d266c68a84d2c780acefba791c45 /tests | |
| parent | aa760b1735907d256758ee67daa64f1e3b09bf0c (diff) | |
| parent | a7d2861d36756b913e85681b86ed3385274e8ced (diff) | |
| download | ffmpeg-0e097616865ea8a1fa8e63a451a4921336660283.tar.gz | |
Merge commit 'a7d2861d36756b913e85681b86ed3385274e8ced'
* commit 'a7d2861d36756b913e85681b86ed3385274e8ced':
svq3: K&R formatting cosmetics
fate: Introduce ENCMUX macro for tests that require encoders and a muxer
ffv1: Add missing #includes to header file
Conflicts:
libavcodec/ffv1.h
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -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 eba7d4faf1..bc18cb58a4 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -55,6 +55,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 296bb42627..dccc2ee248 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -29,7 +29,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 c27061ae87..57486d3124 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 |