[vlc-commits] decoder: reindent

Steve Lhomme git at videolan.org
Wed Jan 16 08:28:35 CET 2019


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jan 15 08:11:00 2019 +0100| [c3b177761c69b0718ed53f96ee153d7ea9f41f97] | committer: Steve Lhomme

decoder: reindent

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

 src/input/decoder.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index bbc3edd867..9e98851d08 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2579,19 +2579,17 @@ bool input_DecoderHasFormatChanged( decoder_t *p_dec, es_format_t *p_fmt, vlc_me
         return false;
 
     vlc_mutex_lock( &p_owner->lock );
-    {
-        if( p_fmt != NULL )
-            es_format_Copy( p_fmt, &p_owner->fmt );
+    if( p_fmt != NULL )
+        es_format_Copy( p_fmt, &p_owner->fmt );
 
-        if( pp_meta )
+    if( pp_meta )
+    {
+        *pp_meta = NULL;
+        if( p_owner->p_description )
         {
-            *pp_meta = NULL;
-            if( p_owner->p_description )
-            {
-                *pp_meta = vlc_meta_New();
-                if( *pp_meta )
-                    vlc_meta_Merge( *pp_meta, p_owner->p_description );
-            }
+            *pp_meta = vlc_meta_New();
+            if( *pp_meta )
+                vlc_meta_Merge( *pp_meta, p_owner->p_description );
         }
     }
     vlc_mutex_unlock( &p_owner->lock );



More information about the vlc-commits mailing list