diff options
author | František Dvořák <valtri@users.sourceforge.net> | 2005-08-25 15:36:29 +0000 |
---|---|---|
committer | František Dvořák <valtri@users.sourceforge.net> | 2005-08-25 15:36:29 +0000 |
commit | f45651f26bc3aa1b312d282c5d8c4b04be0c2505 (patch) | |
tree | 7ff95ed1ee104e776559c7885539e1ff7a39fe97 /src/xine-engine/xine.c | |
parent | 21c4975cc49bbbeac0067aa0847b3604ea639676 (diff) | |
download | xine-lib-f45651f26bc3aa1b312d282c5d8c4b04be0c2505.tar.gz xine-lib-f45651f26bc3aa1b312d282c5d8c4b04be0c2505.tar.bz2 |
*BUGFIX*
Windows ports fixes and improvements due to my current work on toxine:
- first experiments with external win32 pthreads,
more portable code (pthread_t may be a struct)
- headers refactored
- moved dirent win32 replacement to lib/, hide it for frontends,
used system version, if found, not used non-POSIX dirent->d_reclen
(this item doesn't work in MinGW), fix memleak in dvb
- separated settings for postproc and avcodec when using external ffmpeg
- check for malloc.h in public xine.m4, used it conditionally in xine headers
- replaced random() by POSIX more common rand()
- prevent one segfault in directx vo plugin, if fails
- M$VC port update
CVS patchset: 7709
CVS date: 2005/08/25 15:36:29
Diffstat (limited to 'src/xine-engine/xine.c')
-rw-r--r-- | src/xine-engine/xine.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 40f8eb465..c3f326bcd 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2004 the xine project + * Copyright (C) 2000-2005 the xine project * * This file is part of xine, a free video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.314 2005/07/21 02:51:14 miguelfreitas Exp $ + * $Id: xine.c,v 1.315 2005/08/25 15:36:30 valtri Exp $ */ /* @@ -288,7 +288,7 @@ static void stop_internal (xine_stream_t *stream) { /* * stop demux */ - if (stream->demux_plugin && stream->demux_thread) { + if (stream->demux_plugin && stream->demux_thread_created) { lprintf ("stopping demux\n"); _x_demux_stop_thread( stream ); lprintf ("demux stopped\n"); |