]> git.sesse.net Git - vlc/commitdiff
Fixed uninitialized value.
authorLaurent Aimar <fenrir@videolan.org>
Thu, 7 Jan 2010 07:29:26 +0000 (08:29 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Thu, 7 Jan 2010 07:29:26 +0000 (08:29 +0100)
src/input/input.c

index 0241056c47b40ef13069334635d26c4f99956fa0..cd935fa1c8098c40dbc181014cc99bd2f8c3095b 100644 (file)
@@ -2750,11 +2750,10 @@ static void InputSourceMeta( input_thread_t *p_input,
     bool has_meta;
 
     /* Read access meta */
-    if( p_access )
-        has_meta = !access_Control( p_access, ACCESS_GET_META, p_meta );
+    has_meta = p_access && !access_Control( p_access, ACCESS_GET_META, p_meta );
 
     /* Read demux meta */
-    has_meta = (!demux_Control( p_demux, DEMUX_GET_META, p_meta )) || has_meta;
+    has_meta |= !demux_Control( p_demux, DEMUX_GET_META, p_meta );
 
     bool has_unsupported;
     if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &has_unsupported ) )