Commit 52500c68 authored by Laurent Aimar's avatar Laurent Aimar

* mpga: fixed a memleak+warnings.

parent 1e4bfd0d
...@@ -181,20 +181,15 @@ static int Open( vlc_object_t * p_this ) ...@@ -181,20 +181,15 @@ static int Open( vlc_object_t * p_this )
if( ( p_id3 = module_Need( p_demux, "id3", NULL, 0 ) ) ) if( ( p_id3 = module_Need( p_demux, "id3", NULL, 0 ) ) )
{ {
p_sys->meta = (vlc_meta_t *)p_demux->p_private; p_sys->meta = (vlc_meta_t *)p_demux->p_private;
if( p_sys->meta != NULL ) p_demux->p_private = NULL;
{
/* temporary */
msg_Dbg( p_demux, "Title : %s",
vlc_meta_GetValue( p_sys->meta,VLC_META_TITLE ) );
p_demux->p_private = NULL;
}
module_Unneed( p_demux, p_id3 ); module_Unneed( p_demux, p_id3 );
} }
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
{ {
msg_Err( p_demux, "cannot peek" ); msg_Err( p_demux, "cannot peek" );
Close( p_demux ); Close( VLC_OBJECT(p_demux ) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -206,7 +201,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -206,7 +201,7 @@ static int Open( vlc_object_t * p_this )
if( !b_forced && !b_extention ) if( !b_forced && !b_extention )
{ {
msg_Warn( p_demux, "mpga module discarded" ); msg_Warn( p_demux, "mpga module discarded" );
Close( p_demux ); Close( VLC_OBJECT(p_demux) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
...@@ -225,7 +220,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -225,7 +220,7 @@ static int Open( vlc_object_t * p_this )
if( !b_ok && !b_forced ) if( !b_ok && !b_forced )
{ {
msg_Warn( p_demux, "mpga module discarded" ); msg_Warn( p_demux, "mpga module discarded" );
Close( p_demux ); Close( VLC_OBJECT(p_demux) );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment