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/Makefile | |
| parent | aa760b1735907d256758ee67daa64f1e3b09bf0c (diff) | |
| parent | a7d2861d36756b913e85681b86ed3385274e8ced (diff) | |
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/Makefile')
| -rw-r--r-- | tests/Makefile | 1 |
1 files changed, 1 insertions, 0 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 |