Commit f9610dec authored by Laurent Aimar's avatar Laurent Aimar

* input: release p_playlist.

parent 051cddc7
...@@ -201,6 +201,7 @@ static int Demux( demux_t *p_demux ) ...@@ -201,6 +201,7 @@ static int Demux( demux_t *p_demux )
{ {
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
playlist_t *p_playlist; playlist_t *p_playlist;
vlc_bool_t b_eof = VLC_FALSE;
p_playlist = vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, FIND_PARENT ); p_playlist = vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, FIND_PARENT );
...@@ -213,8 +214,8 @@ static int Demux( demux_t *p_demux ) ...@@ -213,8 +214,8 @@ static int Demux( demux_t *p_demux )
switch( p_sys->i_command ) switch( p_sys->i_command )
{ {
case COMMAND_QUIT: case COMMAND_QUIT:
p_demux->p_vlc->b_die = 1; b_eof = p_demux->p_vlc->b_die = VLC_TRUE;
return 0; break;
case COMMAND_LOOP: case COMMAND_LOOP:
playlist_Goto( p_playlist, 0 ); playlist_Goto( p_playlist, 0 );
...@@ -222,20 +223,19 @@ static int Demux( demux_t *p_demux ) ...@@ -222,20 +223,19 @@ static int Demux( demux_t *p_demux )
case COMMAND_PAUSE: case COMMAND_PAUSE:
if( mdate() >= p_sys->expiration ) if( mdate() >= p_sys->expiration )
{ b_eof = VLC_TRUE;
return 0; else
} msleep( 10000 );
msleep( 10000 );
break; break;
case COMMAND_NOP: case COMMAND_NOP:
default: default:
return 0; b_eof = VLC_TRUE;
break;
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return b_eof ? 0 : 1;
return 1;
} }
static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
......
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