[FFmpeg-cvslog] lavfi/tinterlace: remove request frame hack

Paul B Mahol git at videolan.org
Mon May 27 14:44:36 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun May 26 19:03:18 2013 +0000| [4f8e4b8a54ad0193680e3ef0846f459c633ae760] | committer: Paul B Mahol

lavfi/tinterlace: remove request frame hack

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

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

 libavfilter/vf_tinterlace.c |   17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c
index 5e89162..5e3e058 100644
--- a/libavfilter/vf_tinterlace.c
+++ b/libavfilter/vf_tinterlace.c
@@ -114,6 +114,7 @@ static int config_out_props(AVFilterLink *outlink)
     TInterlaceContext *tinterlace = ctx->priv;
 
     tinterlace->vsub = desc->log2_chroma_h;
+    outlink->flags |= FF_LINK_FLAG_REQUEST_LOOP;
     outlink->w = inlink->w;
     outlink->h = tinterlace->mode == MODE_MERGE || tinterlace->mode == MODE_PAD ?
         inlink->h*2 : inlink->h;
@@ -351,21 +352,6 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref)
     return ret;
 }
 
-static int request_frame(AVFilterLink *outlink)
-{
-    TInterlaceContext *tinterlace = outlink->src->priv;
-    AVFilterLink *inlink = outlink->src->inputs[0];
-
-    do {
-        int ret;
-
-        if ((ret = ff_request_frame(inlink)) < 0)
-            return ret;
-    } while (!tinterlace->cur);
-
-    return 0;
-}
-
 static const AVFilterPad tinterlace_inputs[] = {
     {
         .name         = "default",
@@ -380,7 +366,6 @@ static const AVFilterPad tinterlace_outputs[] = {
         .name          = "default",
         .type          = AVMEDIA_TYPE_VIDEO,
         .config_props  = config_out_props,
-        .request_frame = request_frame,
     },
     { NULL }
 };



More information about the ffmpeg-cvslog mailing list