aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-08-25 20:31:50 +0200
committerNicolas George <george@nsup.org>2015-09-20 18:50:00 +0200
commit7635242ae591ec8c9e992f71a2db05b07eeaae3f (patch)
tree885f405bff37c91a19e095bb04786daf35f82cd2
parent807d4b635567e51108ea3a6a774336321c3250e5 (diff)
downloadffmpeg-7635242ae591ec8c9e992f71a2db05b07eeaae3f.tar.gz
lavfi/vf_idet: remove the loop in request_frame().
It is not necessary due to the use of FF_LINK_FLAG_REQUEST_LOOP.
-rw-r--r--libavfilter/vf_idet.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index 711ba6e218..d460330d08 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -314,7 +314,7 @@ static int request_frame(AVFilterLink *link)
AVFilterContext *ctx = link->src;
IDETContext *idet = ctx->priv;
- do {
+ // TODO reindent
int ret;
if (idet->eof)
@@ -328,14 +328,11 @@ static int request_frame(AVFilterLink *link)
if (!next)
return AVERROR(ENOMEM);
- filter_frame(link->src->inputs[0], next);
+ ret = filter_frame(link->src->inputs[0], next);
idet->eof = 1;
- } else if (ret < 0) {
- return ret;
}
- } while (link->frame_requested);
- return 0;
+ return ret;
}
static av_cold void uninit(AVFilterContext *ctx)