aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-08-26 12:21:27 +0200
committerNicolas George <george@nsup.org>2015-09-20 18:50:00 +0200
commit598f8a7afae6d0b8a49f85ec2de69acdc5e7ac6a (patch)
tree14ec1aafcb32b8427e2dccd12e93c1e64bb00860 /libavfilter
parent7635242ae591ec8c9e992f71a2db05b07eeaae3f (diff)
downloadffmpeg-598f8a7afae6d0b8a49f85ec2de69acdc5e7ac6a.tar.gz
lavfi/vf_idet: reindent after last commit.
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/vf_idet.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index d460330d08..21011cf4dd 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -313,24 +313,22 @@ static int request_frame(AVFilterLink *link)
{
AVFilterContext *ctx = link->src;
IDETContext *idet = ctx->priv;
+ int ret;
- // TODO reindent
- int ret;
+ if (idet->eof)
+ return AVERROR_EOF;
- if (idet->eof)
- return AVERROR_EOF;
+ ret = ff_request_frame(link->src->inputs[0]);
- ret = ff_request_frame(link->src->inputs[0]);
+ if (ret == AVERROR_EOF && idet->cur && !idet->analyze_interlaced_flag_done) {
+ AVFrame *next = av_frame_clone(idet->next);
- if (ret == AVERROR_EOF && idet->cur && !idet->analyze_interlaced_flag_done) {
- AVFrame *next = av_frame_clone(idet->next);
+ if (!next)
+ return AVERROR(ENOMEM);
- if (!next)
- return AVERROR(ENOMEM);
-
- ret = filter_frame(link->src->inputs[0], next);
- idet->eof = 1;
- }
+ ret = filter_frame(link->src->inputs[0], next);
+ idet->eof = 1;
+ }
return ret;
}