[FFmpeg-cvslog] lavu/opt: reindent after last commit

Stefano Sabatini git at videolan.org
Fri Sep 7 10:02:54 CEST 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Sep  7 09:39:58 2012 +0200| [cf5629c06424b37cceb4e440a2497ca1d9add284] | committer: Stefano Sabatini

lavu/opt: reindent after last commit

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

 libavutil/opt.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 5f8aaad..0957281 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -267,16 +267,16 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags)
         if (!val || !strcmp(val, "none"))
             ret = PIX_FMT_NONE;
         else {
-        ret = av_get_pix_fmt(val);
-        if (ret == PIX_FMT_NONE) {
-            char *tail;
-            ret = strtol(val, &tail, 0);
-            if (*tail || (unsigned)ret >= PIX_FMT_NB) {
-                av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as pixel format\n", val);
-                return AVERROR(EINVAL);
+            ret = av_get_pix_fmt(val);
+            if (ret == PIX_FMT_NONE) {
+                char *tail;
+                ret = strtol(val, &tail, 0);
+                if (*tail || (unsigned)ret >= PIX_FMT_NB) {
+                    av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as pixel format\n", val);
+                    return AVERROR(EINVAL);
+                }
             }
         }
-        }
         *(enum PixelFormat *)dst = ret;
         return 0;
     }



More information about the ffmpeg-cvslog mailing list