Commit 61ec345b authored by Laurent Aimar's avatar Laurent Aimar

* asf: when there isn't any stream selected, stop playing.

parent 2f9b46d4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* asf.c : ASFv01 file input module for vlc * asf.c : ASFv01 file input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: asf.c,v 1.23 2003/03/14 00:24:08 sigmunau Exp $ * $Id: asf.c,v 1.24 2003/03/16 13:11:28 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -773,6 +773,23 @@ static int Demux( input_thread_t *p_input ) ...@@ -773,6 +773,23 @@ static int Demux( input_thread_t *p_input )
demux_sys_t *p_demux = p_input->p_demux_data; demux_sys_t *p_demux = p_input->p_demux_data;
vlc_bool_t b_play_audio; vlc_bool_t b_play_audio;
int i; int i;
vlc_bool_t b_stream;
b_stream = VLC_FALSE;
for( i = 0; i < 128; i++ )
{
if( p_demux->stream[i] &&
p_demux->stream[i]->p_es &&
p_demux->stream[i]->p_es->p_decoder_fifo )
{
b_stream = VLC_TRUE;
}
}
if( !b_stream )
{
msg_Warn( p_input, "no stream selected, exiting..." );
return( 0 );
}
/* catch seek from user */ /* catch seek from user */
if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT ) if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
...@@ -833,6 +850,11 @@ static int Demux( input_thread_t *p_input ) ...@@ -833,6 +850,11 @@ static int Demux( input_thread_t *p_input )
mtime_t i_time_begin = GetMoviePTS( p_demux ); mtime_t i_time_begin = GetMoviePTS( p_demux );
int i_result; int i_result;
if( p_input->b_die )
{
break;
}
if( ( i_result = DemuxPacket( p_input, b_play_audio ) ) <= 0 ) if( ( i_result = DemuxPacket( p_input, b_play_audio ) ) <= 0 )
{ {
return i_result; return i_result;
......
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