ffmpeg | branch: master | Nicolas George <geo...@nsup.org> | Wed Aug 26 12:21:27 2015 +0200| [598f8a7afae6d0b8a49f85ec2de69acdc5e7ac6a] | committer: Nicolas George
lavfi/vf_idet: reindent after last commit. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=598f8a7afae6d0b8a49f85ec2de69acdc5e7ac6a --- libavfilter/vf_idet.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index d460330..21011cf 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
