diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-12-03 19:23:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-12-03 19:23:16 +0000 |
| commit | 6876730b6da8f78a34c18306a0234c77b681641b (patch) | |
| tree | 2402c814a6cdbc962e9598bc73769f30e0ddca88 /src/xine-engine/demux.c | |
| parent | 81fbe8ca719feb4e02b826bee0a779401a785e3f (diff) | |
| download | xine-lib-1.1.3.tar.gz xine-lib-1.1.3.tar.bz2 | |
should fix bug reported by Christophe Thommeret where avi+subtitlesxine-1_1_3-release1.1.3
(actually master/slave streams) could cause demux to get into an endless
loop.
CVS patchset: 8401
CVS date: 2006/12/03 19:23:16
Diffstat (limited to 'src/xine-engine/demux.c')
| -rw-r--r-- | src/xine-engine/demux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index c6a234ae5..2178ccb71 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -20,7 +20,7 @@ * Demuxer helper functions * hide some xine engine details from demuxers and reduce code duplication * - * $Id: demux.c,v 1.64 2006/08/13 23:51:34 miguelfreitas Exp $ + * $Id: demux.c,v 1.65 2006/12/03 19:23:16 miguelfreitas Exp $ */ @@ -336,7 +336,7 @@ static void *demux_loop (void *stream_gen) { finished_count_video = stream->finished_count_video + 1; pthread_mutex_unlock (&stream->counter_lock); - /* demux_thread_running is zero if demux loop has being stopped by user */ + /* demux_thread_running is zero if demux loop has been stopped by user */ non_user = stream->demux_thread_running; stream->demux_thread_running = 0; |