diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-11-06 23:20:45 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-11-06 23:20:45 +0000 |
| commit | 24f509f4296e611e20684328bc4fcbfc151060fc (patch) | |
| tree | 21887d6e2ea8a663d4d4725bac40a2ce2dd13c29 /src/xine-engine/demux.c | |
| parent | a80e398415ee70ab44930beac307ae1273960e54 (diff) | |
| download | xine-lib-24f509f4296e611e20684328bc4fcbfc151060fc.tar.gz xine-lib-24f509f4296e611e20684328bc4fcbfc151060fc.tar.bz2 | |
fix stream ending deadlock without audio driver
CVS patchset: 3196
CVS date: 2002/11/06 23:20:45
Diffstat (limited to 'src/xine-engine/demux.c')
| -rw-r--r-- | src/xine-engine/demux.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |