From 24f509f4296e611e20684328bc4fcbfc151060fc Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Wed, 6 Nov 2002 23:20:45 +0000 Subject: fix stream ending deadlock without audio driver CVS patchset: 3196 CVS date: 2002/11/06 23:20:45 --- src/xine-engine/demux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/xine-engine/demux.c') diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index e4bc9f4e7..5b7138cd1 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -175,7 +175,8 @@ static void *demux_loop (void *stream_gen) { /* wait before sending end buffers: user might want to do a new seek */ while(stream->demux_thread_running && ((!stream->video_fifo || stream->video_fifo->size(stream->video_fifo)) || - (!stream->audio_fifo || stream->audio_fifo->size(stream->audio_fifo))) && + (stream->audio_out + && (!stream->audio_fifo || stream->audio_fifo->size(stream->audio_fifo)))) && status == DEMUX_FINISHED ){ pthread_mutex_unlock( &stream->demux_lock ); xine_usec_sleep(100000); -- cgit v1.2.3