[xine-cvs] HG: xine-lib: Remove a break which causes some front ends to hang. (cset ce60f8b5995a)

[Darren S. <li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1234102764 0
# Node ID e3fa66d1aff4d4d7f18e1e79586e662ced59502e
# Parent  960687648a92f070d5b4966de4676163cf0cbe89
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.)

diff -r e3fa66d1aff4d4d7f18e1e79586e662ced59502e -r 960687648a92f070d5b4966de4676163cf0cbe89 ChangeLog
--- a/ChangeLog	Sun Feb 08 14:19:24 2009 +0000
+++ b/ChangeLog	Sun Jan 18 16:15:53 2009 +0000
@@ -1,6 +1,8 @@ xine-lib (1.1.17) 2009-??-??
 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 -r e3fa66d1aff4d4d7f18e1e79586e662ced59502e -r 960687648a92f070d5b4966de4676163cf0cbe89 src/xine-engine/demux.c
--- a/src/xine-engine/demux.c	Sun Feb 08 14:19:24 2009 +0000
+++ b/src/xine-engine/demux.c	Sun Jan 18 16:15:53 2009 +0000
@@ -377,7 +377,7 @@ static void *demux_loop (void *stream_ge
     pthread_cond_wait (&stream->counter_changed, &stream->counter_lock);
 
     if (demux_unstick_ao_loop (stream))
-      break;
+      /* break amarok */;
   }
   pthread_mutex_unlock (&stream->counter_lock);