summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-05-26 19:03:18 +0000
committerPaul B Mahol <onemda@gmail.com>2013-05-27 09:55:40 +0000
commit4f8e4b8a54ad0193680e3ef0846f459c633ae760 (patch)
tree1e12ca27d3062d18f7f327c80cb352956832d3ee /libavfilter
parentc63e4e65698f4abd9d03764a8ded1ccdb3d654e7 (diff)
lavfi/tinterlace: remove request frame hack
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_tinterlace.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c
index 5e891626c5..5e3e058016 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 }
};