[FFmpeg-cvslog] avfilter: Reindent

Timothy Gu git at videolan.org
Tue Oct 27 07:25:11 CET 2015


ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Mon Oct 26 23:24:18 2015 -0700| [87d55092611f42a9816e65fbbb6fde412db407eb] | committer: Timothy Gu

avfilter: Reindent

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87d55092611f42a9816e65fbbb6fde412db407eb
---

 libavfilter/avfilter.c |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 8b1b7d2..7dc8b48 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;
 }
 



More information about the ffmpeg-cvslog mailing list