[FFmpeg-cvslog] avfilter/f_streamselect: add check case when nothing is done

Paul B Mahol git at videolan.org
Tue Oct 1 19:49:39 EEST 2019


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Oct  1 18:46:20 2019 +0200| [3bb170e530e3f9885d68e5c684fa82346d7158f4] | committer: Paul B Mahol

avfilter/f_streamselect: add check case when nothing is done

Fixes #7955.

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

 libavfilter/f_streamselect.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavfilter/f_streamselect.c b/libavfilter/f_streamselect.c
index 923deb1a85..4b913d37f4 100644
--- a/libavfilter/f_streamselect.c
+++ b/libavfilter/f_streamselect.c
@@ -21,6 +21,7 @@
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "audio.h"
+#include "filters.h"
 #include "formats.h"
 #include "framesync.h"
 #include "internal.h"
@@ -53,7 +54,7 @@ static int process_frame(FFFrameSync *fs)
     AVFilterContext *ctx = fs->parent;
     StreamSelectContext *s = fs->opaque;
     AVFrame **in = s->frames;
-    int i, j, ret = 0;
+    int i, j, ret = 0, have_out = 0;
 
     for (i = 0; i < ctx->nb_inputs; i++) {
         if ((ret = ff_framesync_get_frame(&s->fs, i, &in[i], 0)) < 0)
@@ -75,12 +76,15 @@ static int process_frame(FFFrameSync *fs)
                 out->pts = av_rescale_q(s->fs.pts, s->fs.time_base, ctx->outputs[i]->time_base);
                 s->last_pts[j] = in[j]->pts;
                 ret = ff_filter_frame(ctx->outputs[i], out);
+                have_out = 1;
                 if (ret < 0)
                     return ret;
             }
         }
     }
 
+    if (!have_out)
+        ff_filter_set_ready(ctx, 100);
     return ret;
 }
 



More information about the ffmpeg-cvslog mailing list