summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-08-27 08:49:58 +0200
committerPaul B Mahol <onemda@gmail.com>2017-08-27 08:53:50 +0200
commit99b6e68441ce49838ee424d2c3b659c92c01b368 (patch)
tree6cbcf893183d5692d5e2e928cee1c80ad3bee022 /libavfilter
parent257f0d09f7b40050aee9cede5778d4df938dfc86 (diff)
avfilter/af_amix: do not request samples if inlink reached EOF
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/af_amix.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index d11edaaec9..09848e5d91 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -370,7 +370,8 @@ static int request_samples(AVFilterContext *ctx, int min_samples)
av_assert0(s->nb_inputs > 1);
for (i = 1; i < s->nb_inputs; i++) {
- if (!(s->input_state[i] & INPUT_ON))
+ if (!(s->input_state[i] & INPUT_ON) ||
+ (s->input_state[i] & INPUT_EOF))
continue;
if (av_audio_fifo_size(s->fifos[i]) >= min_samples)
continue;