diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 10:29:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-18 10:48:00 +0200 |
| commit | 17e4b0644b5ad13733bd863b14ab11ffa955009c (patch) | |
| tree | 46cc4748ea765ca0553bac23a49d502c9aed5038 /tests/Makefile | |
| parent | eb19d89d8eb51f20299d59558d69d0f057583e7c (diff) | |
| parent | 292d1e78743855404c7d07e3e7cb3f9c9ae6275b (diff) | |
| download | ffmpeg-17e4b0644b5ad13733bd863b14ab11ffa955009c.tar.gz | |
Merge commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b'
* commit '292d1e78743855404c7d07e3e7cb3f9c9ae6275b':
fate: dependencies for acodec tests
fate: dependencies for vsynth tests
fate: add macros useful for conditionally enabling things
libmp3lame: resize the output buffer if needed
Conflicts:
tests/fate/acodec.mak
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
| -rw-r--r-- | tests/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index ac74b44b83..21a54e2b1e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -41,6 +41,19 @@ tests/data/ffprobe-test.nut: ffmpeg$(EXESUF) | tests/data tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN +ALLYES = $(strip $(call XYES, $(1))) +XYES = $(if $(strip $(1)), \ + $(if $(CONFIG_$(firstword $(1))), \ + $(call XYES, $(wordlist 2, $(words $(1)), $(1)))), \ + yes) + +ENCDEC = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ + $(firstword $(2))_MUXER $(lastword $(2))_DEMUXER) + +ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ + $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \ + $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) + include $(SRC_PATH)/tests/fate/acodec.mak include $(SRC_PATH)/tests/fate/vcodec.mak |