[FFmpeg-cvslog] Revert "lavfi/buffersrc: push the frame deeper if requested."

Paul B Mahol git at videolan.org
Fri Jun 23 17:20:03 EEST 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jun 23 16:18:42 2017 +0200| [04aa09c4bcf2d5a634a35da3a3ae3fc1abe30ef8] | committer: Paul B Mahol

Revert "lavfi/buffersrc: push the frame deeper if requested."

Fixes framesync filters with shortest option enabled.

This reverts commit 0ff5567a30be6d7c804e95997ae282d6bacd76c3.

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

 libavfilter/buffersrc.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index e8f59c2de7..587b29b91a 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -173,20 +173,6 @@ int attribute_align_arg av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFra
     return ret;
 }
 
-static int push_frame(AVFilterGraph *graph)
-{
-    int ret;
-
-    while (1) {
-        ret = ff_filter_graph_run_once(graph);
-        if (ret == AVERROR(EAGAIN))
-            break;
-        if (ret < 0)
-            return ret;
-    }
-    return 0;
-}
-
 static int av_buffersrc_add_frame_internal(AVFilterContext *ctx,
                                            AVFrame *frame, int flags)
 {
@@ -199,11 +185,6 @@ static int av_buffersrc_add_frame_internal(AVFilterContext *ctx,
     if (!frame) {
         s->eof = 1;
         ff_avfilter_link_set_in_status(ctx->outputs[0], AVERROR_EOF, AV_NOPTS_VALUE);
-        if ((flags & AV_BUFFERSRC_FLAG_PUSH)) {
-            ret = push_frame(ctx->graph);
-            if (ret < 0)
-                return ret;
-        }
         return 0;
     } else if (s->eof)
         return AVERROR(EINVAL);
@@ -258,12 +239,6 @@ static int av_buffersrc_add_frame_internal(AVFilterContext *ctx,
     if ((ret = ctx->output_pads[0].request_frame(ctx->outputs[0])) < 0)
         return ret;
 
-    if ((flags & AV_BUFFERSRC_FLAG_PUSH)) {
-        ret = push_frame(ctx->graph);
-        if (ret < 0)
-            return ret;
-    }
-
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list