aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2015-10-26 23:24:18 -0700
committerTimothy Gu <timothygu99@gmail.com>2015-10-26 23:24:18 -0700
commit87d55092611f42a9816e65fbbb6fde412db407eb (patch)
tree13d61f8dfa05fe65b6031245d7702948452fa1d9
parent9b40ce5a454895866330cdaeccac986bbbc3b18d (diff)
downloadffmpeg-87d55092611f42a9816e65fbbb6fde412db407eb.tar.gz
avfilter: Reindent
-rw-r--r--libavfilter/avfilter.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 8b1b7d2326..7dc8b482be 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -347,20 +347,19 @@ int ff_request_frame(AVFilterLink *link)
if (link->closed)
return AVERROR_EOF;
- // 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 (ret < 0) {
- if (ret == AVERROR_EOF)
- link->closed = 1;
- }
+ 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) {
+ if (ret == AVERROR_EOF)
+ link->closed = 1;
+ }
return ret;
}