aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-22 13:13:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-22 14:54:38 +0200
commit80d4d3a41de64884a83b7df7bd5c8768c2853aae (patch)
treebd7afe873557df45b02bcf3e9dbfba5e9e80c71f
parent2f11aa141a01f97c5d2a015bd9dbdb27314b79c4 (diff)
downloadffmpeg-80d4d3a41de64884a83b7df7bd5c8768c2853aae.tar.gz
fate: re-enable af_join test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--tests/fate/filter-audio.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
index ab298e4aea..6eaa4bff35 100644
--- a/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
@@ -45,13 +45,13 @@ fate-filter-channelsplit: CMD = md5 -i $(SRC) -filter_complex channelsplit -f s1
fate-filter-channelsplit: CMP = oneline
fate-filter-channelsplit: REF = d92988d0fe2dd92236763f47b07ab597
-#FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-join
fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav
fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav
fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le
fate-filter-join: CMP = oneline
-fate-filter-join: REF = 409e66fc5ece4ddea4aa16bc47026bb0
+fate-filter-join: REF = 88b0d24a64717ba8635b29e8dac6ecd8
FATE_AFILTER-$(call ALLYES, WAV_DEMUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER PCM_S16LE_MUXER APERMS_FILTER VOLUME_FILTER) += fate-filter-volume
fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav