aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/vf_yadif.c
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-10-02 15:58:53 +0200
committerNicolas George <george@nsup.org>2015-10-07 19:05:13 +0200
commit8a9fa46e87daf09fca14c903e6ee0c13fd453998 (patch)
tree4b8b36b2b244516c14386ad5c02068eaf37508fa /libavfilter/vf_yadif.c
parentea2fd42f9df495d248aefb4dadc5c9c8131b76b8 (diff)
downloadffmpeg-8a9fa46e87daf09fca14c903e6ee0c13fd453998.tar.gz
lavfi/vf_yadif: reindent after last commit.
Diffstat (limited to 'libavfilter/vf_yadif.c')
-rw-r--r--libavfilter/vf_yadif.c28
1 files changed, 13 insertions, 15 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index c32c06592a..b546a088c9 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -386,26 +386,24 @@ static int request_frame(AVFilterLink *link)
return 0;
}
+ if (yadif->eof)
+ return AVERROR_EOF;
- /* TODO reindent */
- if (yadif->eof)
- return AVERROR_EOF;
+ ret = ff_request_frame(link->src->inputs[0]);
- ret = ff_request_frame(link->src->inputs[0]);
+ if (ret == AVERROR_EOF && yadif->cur) {
+ AVFrame *next = av_frame_clone(yadif->next);
- if (ret == AVERROR_EOF && yadif->cur) {
- AVFrame *next = av_frame_clone(yadif->next);
-
- if (!next)
- return AVERROR(ENOMEM);
+ if (!next)
+ return AVERROR(ENOMEM);
- next->pts = yadif->next->pts * 2 - yadif->cur->pts;
+ next->pts = yadif->next->pts * 2 - yadif->cur->pts;
- filter_frame(link->src->inputs[0], next);
- yadif->eof = 1;
- } else if (ret < 0) {
- return ret;
- }
+ filter_frame(link->src->inputs[0], next);
+ yadif->eof = 1;
+ } else if (ret < 0) {
+ return ret;
+ }
return 0;
}