diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2013-04-03 17:43:53 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2013-04-03 17:44:10 +0200 |
| commit | 69d67fb622b67b2f978725d5fc07ab1571e632dd (patch) | |
| tree | b35157b51cd1ad4382868229964dd3628728ee46 /libavfilter/avfilter.c | |
| parent | 79d8cfacf07863500d4fedec669c49e2552c3876 (diff) | |
| download | ffmpeg-69d67fb622b67b2f978725d5fc07ab1571e632dd.tar.gz | |
lavfi: reindent after last commit.
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f62194136c..b689fbe9d4 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -326,16 +326,15 @@ int ff_request_frame(AVFilterLink *link) av_assert0(!link->frame_requested); link->frame_requested = 1; while (link->frame_requested) { - /* TODO reindent */ - if (link->srcpad->request_frame) - ret = link->srcpad->request_frame(link); - else if (link->src->inputs[0]) - ret = ff_request_frame(link->src->inputs[0]); - if (ret == AVERROR_EOF && link->partial_buf) { - AVFrame *pbuf = link->partial_buf; - link->partial_buf = NULL; - ret = ff_filter_frame_framed(link, pbuf); - } + if (link->srcpad->request_frame) + ret = link->srcpad->request_frame(link); + else if (link->src->inputs[0]) + ret = ff_request_frame(link->src->inputs[0]); + if (ret == AVERROR_EOF && link->partial_buf) { + AVFrame *pbuf = link->partial_buf; + link->partial_buf = NULL; + ret = ff_filter_frame_framed(link, pbuf); + } if (ret < 0) { link->frame_requested = 0; if (ret == AVERROR_EOF) |