[FFmpeg-cvslog] avfilter/af_amix: do not request samples if inlink reached EOF

Paul B Mahol git at videolan.org
Sun Aug 27 09:54:04 EEST 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Aug 27 08:49:58 2017 +0200| [99b6e68441ce49838ee424d2c3b659c92c01b368] | committer: Paul B Mahol

avfilter/af_amix: do not request samples if inlink reached EOF

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99b6e68441ce49838ee424d2c3b659c92c01b368
---

 libavfilter/af_amix.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;



More information about the ffmpeg-cvslog mailing list