[FFmpeg-cvslog] lavfi/vf_thumbnail: 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 16:20:17 2015 +0200| [ea2fd42f9df495d248aefb4dadc5c9c8131b76b8] | committer: Nicolas George

lavfi/vf_thumbnail: reindent after last commit.

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

 libavfilter/vf_thumbnail.c |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c
index 64cedd4..417ccd5 100644
--- a/libavfilter/vf_thumbnail.c
+++ b/libavfilter/vf_thumbnail.c
@@ -171,17 +171,16 @@ static int request_frame(AVFilterLink *link)
 {
     AVFilterContext *ctx = link->src;
     ThumbContext *s = ctx->priv;
+    int ret = ff_request_frame(ctx->inputs[0]);
 
-    /* TODO reindent */
-        int ret = ff_request_frame(ctx->inputs[0]);
-        if (ret == AVERROR_EOF && s->n) {
-            ret = ff_filter_frame(link, get_best_frame(ctx));
-            if (ret < 0)
-                return ret;
-            ret = AVERROR_EOF;
-        }
+    if (ret == AVERROR_EOF && s->n) {
+        ret = ff_filter_frame(link, get_best_frame(ctx));
         if (ret < 0)
             return ret;
+        ret = AVERROR_EOF;
+    }
+    if (ret < 0)
+        return ret;
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list