[vlc-devel] [PATCH 5/6] avcodec: re-indent for the next commit

Thomas Guillem thomas at gllm.fr
Thu Sep 26 16:38:13 CEST 2019


No functional changes except the move of the ret definition.
---
 modules/codec/avcodec/video.c | 47 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index d69abd7419..467ff6c1f9 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -438,7 +438,6 @@ static int OpenVideoCodec( decoder_t *p_dec )
     decoder_sys_t *p_sys = p_dec->p_sys;
     AVCodecContext *ctx = p_sys->p_context;
     const AVCodec *codec = p_sys->p_codec;
-    int ret;
 
     if( ctx->extradata_size <= 0 )
     {
@@ -478,30 +477,30 @@ static int OpenVideoCodec( decoder_t *p_dec )
         ctx->active_thread_type = FF_THREAD_SLICE;
     }
 
-    ret = ffmpeg_OpenCodec( p_dec, ctx, codec );
-    if( ret < 0 )
-        return ret;
+        int ret = ffmpeg_OpenCodec( p_dec, ctx, codec );
+        if( ret < 0 )
+            return ret;
 
-    switch( ctx->active_thread_type )
-    {
-        case FF_THREAD_FRAME:
-            msg_Dbg( p_dec, "using frame thread mode with %d threads",
-                     ctx->thread_count );
-            break;
-        case FF_THREAD_SLICE:
-            msg_Dbg( p_dec, "using slice thread mode with %d threads",
-                     ctx->thread_count );
-            break;
-        case 0:
-            if( ctx->thread_count > 1 )
-                msg_Warn( p_dec, "failed to enable threaded decoding" );
-            break;
-        default:
-            msg_Warn( p_dec, "using unknown thread mode with %d threads",
-                      ctx->thread_count );
-            break;
-    }
-    return 0;
+        switch( ctx->active_thread_type )
+        {
+            case FF_THREAD_FRAME:
+                msg_Dbg( p_dec, "using frame thread mode with %d threads",
+                         ctx->thread_count );
+                break;
+            case FF_THREAD_SLICE:
+                msg_Dbg( p_dec, "using slice thread mode with %d threads",
+                         ctx->thread_count );
+                break;
+            case 0:
+                if( ctx->thread_count > 1 )
+                    msg_Warn( p_dec, "failed to enable threaded decoding" );
+                break;
+            default:
+                msg_Warn( p_dec, "using unknown thread mode with %d threads",
+                          ctx->thread_count );
+                break;
+        }
+        return 0;
 }
 
 /*****************************************************************************
-- 
2.20.1



More information about the vlc-devel mailing list