]> git.sesse.net Git - vlc/commitdiff
* mpga: fixed a memleak+warnings.
authorLaurent Aimar <fenrir@videolan.org>
Sun, 18 Jul 2004 16:33:02 +0000 (16:33 +0000)
committerLaurent Aimar <fenrir@videolan.org>
Sun, 18 Jul 2004 16:33:02 +0000 (16:33 +0000)
modules/demux/mpeg/mpga.c

index ca0f10eaf08d190c5e83504b577de3ce312c0932..32a60ccf3bad523237902df34a6645f823170496 100644 (file)
@@ -181,20 +181,15 @@ static int Open( vlc_object_t * p_this )
     if( ( p_id3 = module_Need( p_demux, "id3", NULL, 0 ) ) )
     {
         p_sys->meta = (vlc_meta_t *)p_demux->p_private;
-        if( p_sys->meta != NULL )
-        {
-            /* temporary */
-            msg_Dbg( p_demux, "Title : %s",
-                     vlc_meta_GetValue( p_sys->meta,VLC_META_TITLE ) );
-            p_demux->p_private = NULL;
-        }
+        p_demux->p_private = NULL;
+
         module_Unneed( p_demux, p_id3 );
     }
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
     {
         msg_Err( p_demux, "cannot peek" );
-        Close( p_demux );
+        Close( VLC_OBJECT(p_demux ) );
         return VLC_EGENERIC;
     }
 
@@ -206,7 +201,7 @@ static int Open( vlc_object_t * p_this )
         if( !b_forced && !b_extention )
         {
             msg_Warn( p_demux, "mpga module discarded" );
-            Close( p_demux );
+            Close( VLC_OBJECT(p_demux) );
             return VLC_EGENERIC;
         }
 
@@ -225,7 +220,7 @@ static int Open( vlc_object_t * p_this )
         if( !b_ok && !b_forced )
         {
             msg_Warn( p_demux, "mpga module discarded" );
-            Close( p_demux );
+            Close( VLC_OBJECT(p_demux) );
             return VLC_EGENERIC;
         }
     }