aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/acodec.mak
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-05-29 09:49:44 +0100
committerMans Rullgard <mans@mansr.com>2012-05-29 17:49:44 +0100
commitf919cc7df6ab844bc12f89fe7bef4fb915a47725 (patch)
tree4db74b63e23a8da8e5bfefe0f2f89d7204160a25 /tests/fate/acodec.mak
parentc58bcead3b84765ee7bc22258bca672fc0d63733 (diff)
downloadffmpeg-f919cc7df6ab844bc12f89fe7bef4fb915a47725.tar.gz
fate: fix acodec/vsynth tests for make 3.81
GNU make 3.81 applies pattern rules in declaration order rather than by stem length as in 3.82. This moves the more generic patterns above the more specific ones such that they work with either make version. Some of the vsynth patterns are also simplified a little. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'tests/fate/acodec.mak')
-rw-r--r--tests/fate/acodec.mak9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 6d5e826f43..b4d0cea93b 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -1,3 +1,8 @@
+fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
+fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
+fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
+fate-acodec-%: CMP_UNIT = 2
+
FATE_ACODEC_PCM = alaw mulaw \
s8 u8 \
s16be s16le \
@@ -40,10 +45,6 @@ fate-acodec-flac: FMT = flac
fate-acodec-flac: CODEC = flac -compression_level 2
$(FATE_ACODEC): tests/data/asynth-44100-2.wav
-fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
-fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
-fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
-fate-acodec-%: CMP_UNIT = 2
FATE_AVCONV += $(FATE_ACODEC)
fate-acodec: $(FATE_ACODEC)