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/libffmpeg | |
| 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/libffmpeg')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/dvaudio_decoder.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index cf1ec66e8..5927fbebc 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -35,7 +35,7 @@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ endif xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ - $(link_ffmpeg) + $(link_ffmpeg) $(THREAD_LIBS) xineplug_decode_dvaudio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_dvaudio_la_SOURCES = dvaudio_decoder.c diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/dvaudio_decoder.c index af2c95db9..2ad4b6c5c 100644 --- a/src/libffmpeg/dvaudio_decoder.c +++ b/src/libffmpeg/dvaudio_decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 the xine project + * Copyright (C) 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: dvaudio_decoder.c,v 1.6 2004/12/16 13:58:57 mroi Exp $ + * $Id: dvaudio_decoder.c,v 1.7 2005/08/25 15:36:30 valtri Exp $ * * dv audio decoder based on patch by Dan Dennedy <dan@dennedy.org> * @@ -31,7 +31,6 @@ #include <stdio.h> #include <inttypes.h> #include <string.h> -#include <pthread.h> #include <math.h> #define LOG_MODULE "dvaudio" |