summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_smjpeg.c
diff options
context:
space:
mode:
authorJuergen Keil <jkeil@users.sourceforge.net>2002-10-12 17:11:58 +0000
committerJuergen Keil <jkeil@users.sourceforge.net>2002-10-12 17:11:58 +0000
commit0314fd1631454084e823e94918edb79019b96e63 (patch)
tree16e791f3f11c2571318d3741b27564c61e27093f /src/demuxers/demux_smjpeg.c
parentbf4abc064662be3f8a52a7fcff159e6379800ab9 (diff)
downloadxine-lib-0314fd1631454084e823e94918edb79019b96e63.tar.gz
xine-lib-0314fd1631454084e823e94918edb79019b96e63.tar.bz2
While the demuxer mutex is unlocked, relinquish the processor in the main
demuxer loop, otherwise (on solaris) demux_*_stop() has no chance to lock the mutex and change the demuxer status variable for interrupting the demuxer. Fixes xine_stop() problems on solaris. CVS patchset: 2815 CVS date: 2002/10/12 17:11:58
Diffstat (limited to 'src/demuxers/demux_smjpeg.c')
-rw-r--r--src/demuxers/demux_smjpeg.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 1619d36a3..643bf7059 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
* For more information on the SMJPEG file format, visit:
* http://www.lokigames.com/development/smjpeg.php3
*
- * $Id: demux_smjpeg.c,v 1.18 2002/10/06 03:48:13 komadori Exp $
+ * $Id: demux_smjpeg.c,v 1.19 2002/10/12 17:11:59 jkeil Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -32,6 +32,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <pthread.h>
+#include <sched.h>
#include <string.h>
#include <stdlib.h>
@@ -123,6 +124,8 @@ static void *demux_smjpeg_loop (void *this_gen) {
/* someone may want to interrupt us */
pthread_mutex_unlock( &this->mutex );
+ /* give demux_*_stop a chance to interrupt us */
+ sched_yield();
pthread_mutex_lock( &this->mutex );
/* load the next sample */