[FFmpeg-cvslog] avfilter/vf_mix: always output frame if array is filled

Paul B Mahol git at videolan.org
Sat Feb 2 20:00:21 EET 2019


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Feb  2 18:54:54 2019 +0100| [08b83bf8289383affd971f6f459f05282197e904] | committer: Paul B Mahol

avfilter/vf_mix: always output frame if array is filled

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

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

diff --git a/libavfilter/vf_mix.c b/libavfilter/vf_mix.c
index 79b3733145..873bef9dc3 100644
--- a/libavfilter/vf_mix.c
+++ b/libavfilter/vf_mix.c
@@ -354,7 +354,8 @@ static int tmix_filter_frame(AVFilterLink *inlink, AVFrame *in)
     if (s->nb_frames < s->nb_inputs) {
         s->frames[s->nb_frames] = in;
         s->nb_frames++;
-        return 0;
+        if (s->nb_frames < s->nb_inputs)
+            return 0;
     } else {
         av_frame_free(&s->frames[0]);
         memmove(&s->frames[0], &s->frames[1], sizeof(*s->frames) * (s->nb_inputs - 1));



More information about the ffmpeg-cvslog mailing list