From d50b6542e330db416b50aa717aa67e2a0b564d58 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 8 Feb 2009 14:19:24 +0000 Subject: Remove a break which causes some front ends to hang. (cset ce60f8b5995a) (If this causes xine-lib to hang on certain broken streams, we have a problem.) --- ChangeLog | 2 ++ src/xine-engine/demux.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1cecbb033..9968b2f43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ xine-lib (1.1.17) 2009-??-?? * Build fixes related to ImageMagick 6.4 & later. * Fix an error in Matroska PTS calculation. + * Some front ends hang due to the hang fixes in 1.1.16. Fix this by + removing a break statement. * Enable libmpeg2new. This is not yet production code; the old mpeg2 decoder remains the default. * Fix a broken size check in the pvr input plugin (ref. CVE-2008-5239). diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 4d6bc6c1c..cfb13831e 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -377,7 +377,7 @@ static void *demux_loop (void *stream_gen) { pthread_cond_wait (&stream->counter_changed, &stream->counter_lock); if (demux_unstick_ao_loop (stream)) - break; + /* break amarok */; } pthread_mutex_unlock (&stream->counter_lock); -- cgit v1.2.3