[FFmpeg-cvslog] lavfi/vf_yadif: reindent after last commit.
Nicolas George
git at videolan.org
Wed Oct 7 19:08:37 CEST 2015
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Fri Oct 2 15:58:53 2015 +0200| [8a9fa46e87daf09fca14c903e6ee0c13fd453998] | committer: Nicolas George
lavfi/vf_yadif: reindent after last commit.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8a9fa46e87daf09fca14c903e6ee0c13fd453998
---
libavfilter/vf_yadif.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index c32c065..b546a08 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;
}
More information about the ffmpeg-cvslog
mailing list