Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-04 05:40:32 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-01-04 05:47:34 +0400
commitad5e4e0f947ab686325fc7783afd18cd9cd88dc4 (patch)
treed0b15c19897c45fb730a7d875ddc342e5a65190a /tests/fate
parentcf867517f15bb5c9618dea6e546592622c0773a5 (diff)
parentb318106fae65149356934fc72feafef3272fd4ea (diff)
Merge commit 'b318106fae65149356934fc72feafef3272fd4ea'
* commit 'b318106fae65149356934fc72feafef3272fd4ea': FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/libavresample.mak7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/fate/libavresample.mak b/tests/fate/libavresample.mak
index d7c856ba43..bd4518e7b2 100644
--- a/tests/fate/libavresample.mak
+++ b/tests/fate/libavresample.mak
@@ -18,6 +18,13 @@ $(call CROSS_TEST,$(MIX_CHANNELS),MIX,q8,s16p)
$(call CROSS_TEST,$(MIX_CHANNELS),MIX,q15,s16p)
$(call CROSS_TEST,$(MIX_CHANNELS),MIX,flt,fltp)
+# test output zeroing with skipped corresponding input
+FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, CHANNELMAP RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-lavr-mix-output-zero
+fate-lavr-mix-output-zero: tests/data/filtergraphs/lavr_mix_output_zero tests/data/asynth-44100-4.wav
+fate-lavr-mix-output-zero: CMP = oneoff
+fate-lavr-mix-output-zero: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-4.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/lavr_mix_output_zero -f s16le -
+fate-lavr-mix-output-zero: REF = $(SAMPLES)/lavr/lavr-mix-output-zero
+
FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_MIX)
fate-lavr-mix: $(FATE_LAVR_MIX-yes)
#FATE_LAVR += $(FATE_LAVR_MIX-yes)