Attachment 52066 Details for Bug 120088

[patch] stable-bugfixes.patch

stable-bugfixes.patch (text/plain), 102.33 KB, created by Thomas Biege on 2005-10-10 08:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2005-10-10 08:56:52 UTC

Size: 102.33 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/ChangeLog,v
>retrieving revision 1.550.2.9
>diff -u -r1.550.2.9 ChangeLog
>--- ChangeLog	26 Jul 2005 21:17:11 -0000	1.550.2.9
>+++ ChangeLog	8 Oct 2005 14:28:33 -0000
>@@ -1,4 +1,6 @@
> xine-lib (1.0.3)
>+  * fixed format string vulnerability in audio CD input plugin
>+  * some build system fixes for Windows
> 
> xine-lib (1.0.2)
>   * fixed playback of single-session Real RTSP streams, such as
>Index: configure.ac
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/configure.ac,v
>retrieving revision 1.304.2.10
>diff -u -r1.304.2.10 configure.ac
>--- configure.ac	28 Jul 2005 20:47:59 -0000	1.304.2.10
>+++ configure.ac	8 Oct 2005 14:28:39 -0000
>@@ -16,7 +16,7 @@
> dnl
> XINE_MAJOR=1
> XINE_MINOR=0
>-XINE_SUB=2
>+XINE_SUB=3
> 
> if test $XINE_SUB -eq 0 ; then
>   XINE_SUBPART="";
>@@ -50,7 +50,7 @@
> dnl    libname.so.(XINE_LT_CURRENT - XINE_LT_AGE).XINE_LT_AGE.XINE_LT_REVISION
> 
> XINE_LT_CURRENT=14
>-XINE_LT_REVISION=0
>+XINE_LT_REVISION=1
> XINE_LT_AGE=13
> 
> dnl for a release tarball do "rm .cvsversion" before "make dist"
>@@ -192,22 +192,84 @@
> dnl threads and OS specific stuff
> dnl ---------------------------------------------
> 
>+AC_ARG_WITH(pthread-prefix, 
>+  AC_HELP_STRING(
>+    [--with-pthread-prefix=PREFIX],
>+    [path to pthread library]),
>+  [pthread_prefix="$withval"],
>+  [pthread_prefix="no"])
>+
> case "$host" in
>   *-*-freebsd*)
>-    THREAD_LIBS="-L/usr/local/lib -pthread"
>-    THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
>-
>-    CFLAGS="$THREAD_CFLAGS $CFLAGS"
>+    if test x"$pthread_prefix" = "xno"; then
>+      pthread_prefix="/usr/local"
>+    fi
>+    THREAD_LIBS="-L$pthread_prefix/lib -pthread"
>+    THREAD_CPPFLAGS="-I$pthread_prefix/include"
>+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS -D_THREAD_SAFE"
>+    have_pthread=yes
> 
>     ;;
> 
>   *-*-hpux11*)
>-    THREAD_LIBS=" -lpthread"
>-    THREAD_CFLAGS="-D_REENTRANT"
>-    CFLAGS="$THREAD_CFLAGS $CFLAGS"
>+    THREAD_LIBS="-lpthread"
>+    have_pthread=yes
>+
>+    ;;
>+
>+  *)
>+    if test x"$pthread_prefix" = "xno"; then
>+      THREAD_LIBS="-lpthread"
>+    else
>+      THREAD_LIBS="-L$pthread_prefix/lib -lpthread"
>+      THREAD_CPPFLAGS="-I$pthread_prefix/include"
>+    fi
>+    CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS"
>+
>+    ac_save_LIBS="$LIBS"
>+    LIBS="$LIBS $THREAD_LIBS"
>+
>+    AC_CHECK_LIB(pthread, pthread_create, have_pthread=yes)
> 
>+    LIBS="$ac_save_LIBS"
>     ;;
>+esac
>+
>+if test x"$have_pthread" != "xyes"; then
>+  AC_MSG_ERROR(pthread needed)
>+fi
>+
>+AC_SUBST(THREAD_CPPFLAGS)
>+AC_SUBST(THREAD_LIBS)
>+
>+dnl
>+AC_MSG_CHECKING(for recursive mutex support in pthread)
>+ac_save_LIBS="$LIBS"
>+LIBS="$LIBS $THREAD_LIBS"
>+
>+AC_DEFINE(_GNU_SOURCE)
>+have_recursive_mutex=no
>+AC_COMPILE_IFELSE(AC_LANG_SOURCE([#include <pthread.h>
> 
>+int main() {
>+  pthread_mutexattr_t attr;
>+  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
>+  return 0;
>+}
>+	]),[
>+	    have_recursive_mutex=yes
>+	],[
>+	    AC_MSG_ERROR(recursive mutex support is needed - please report)
>+	])
>+LIBS="$ac_save_LIBS"
>+
>+AC_MSG_RESULT($have_recursive_mutex)
>+
>+
>+dnl ---------------------------------------------
>+dnl Windows ports checks
>+dnl ---------------------------------------------
>+case "$host" in
>   *-*-mingw* | *-*-cygwin*)
>     dnl check if we are using the cygwin, mingw or cygwin with mno-cygwin mode
>     dnl in which case we are actually dealing with a mingw32 compiler
>@@ -225,68 +287,17 @@
>     esac
> 
>     if test "$SYS" = "mingw32"; then
>-      THREAD_CONFIGURE_CPPFLAGS="-I${srcdir}/win32/contrib/pthreads"
>-      THREAD_INCLUDES='-I$(top_srcdir)/win32/contrib/pthreads'
>-      THREAD_LIBS='$(top_builddir)/win32/contrib/pthreads/libpthread.la'
>-      THREAD_CFLAGS_CONFIG=" "
>-      THREAD_LIBS_CONFIG=" "
>-      WIN32_CPPFLAGS='-I$(top_srcdir)/win32/include -I$(top_srcdir)/win32/contrib/dirent'
>+      WIN32_CPPFLAGS='-I$(top_srcdir)/win32/include'
>       LIBS="-lwinmm -lwsock32 $LIBS"
>       GOOM_LIBS="-liberty"
>-
>-      need_internal_zlib=yes
>     fi
>     LDFLAGS="-no-undefined $LDFLAGS"
>     ;;
>-    
>-
>-  *)
>-    AC_CHECK_LIB(pthread, pthread_create,
>-  	     [THREAD_LIBS="-lpthread"],
>- 	     [AC_MSG_ERROR(pthread needed)])
>-    ;;
> esac
>-dnl different thread cflags and libs for libxine and for external 
>-dnl application linking libxine
>-if test "x$THREAD_CFLAGS_CONFIG" = "x"; then
>-  THREAD_CFLAGS_CONFIG=$THREAD_CFLAGS
>-fi
>-if test "x$THREAD_LIBS_CONFIG" = "x"; then
>-  THREAD_LIBS_CONFIG=$THREAD_LIBS
>-fi
>-dnl used for building xine
>-AC_SUBST(THREAD_CFLAGS)
>-AC_SUBST(THREAD_INCLUDES)
>-AC_SUBST(THREAD_LIBS)
> AC_SUBST(GOOM_LIBS)
>-dnl needed for xine-config
>-AC_SUBST(THREAD_CFLAGS_CONFIG)
>-AC_SUBST(THREAD_LIBS_CONFIG)
>-dnl WIN32 platform
> AC_SUBST(WIN32_CPPFLAGS)
> AM_CONDITIONAL(WIN32, test x$SYS = "xmingw32")
> 
>-dnl
>-AC_MSG_CHECKING(for recursive mutex support in pthread)
>-AC_DEFINE(_GNU_SOURCE)
>-have_recursive_mutex=no
>-saved_cppflags="$CPPFLAGS"
>-CPPFLAGS="$CPPFLAGS $THREAD_CONFIGURE_CPPFLAGS"
>-AC_COMPILE_IFELSE(AC_LANG_SOURCE([#include <pthread.h>
>-
>-int main() {
>-  pthread_mutexattr_t attr;
>-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
>-  return 0;
>-})
>-	],[
>-	    have_recursive_mutex=yes
>-	],[
>-	    AC_MSG_ERROR(recursive mutex support is needed - please report)
>-	])
>-AC_MSG_RESULT($have_recursive_mutex)
>-CPPFLAGS="$saved_cppflags"
>-
> 
> dnl ---------------------------------------------
> dnl dynamic linker
>@@ -455,23 +466,38 @@
> dnl zlib
> dnl ---------------------------------------------
> 
>-dnl internal zlib permited only in MINGW-like platform
>-if test "x$need_internal_zlib" = "xyes"; then
>-  have_zlib=no
>-  ZLIB_INCLUDES='-I$(top_srcdir)/win32/contrib/zlib'
>-  ZLIB_LIBS='$(top_builddir)/win32/contrib/zlib/libzlib.la'
>-  ZLIB_LIBS_CONFIG=""
>-else
>-  AC_CHECK_LIB(z, gzsetparams,
>-    [AC_CHECK_HEADER(zlib.h,
>-       have_zlib=yes
>-       ZLIB_LIBS="-lz"
>-       ZLIB_LIBS_CONFIG="-lz",)], AC_MSG_ERROR(zlib needed))
>+AC_ARG_WITH(zlib-prefix, 
>+  AC_HELP_STRING(
>+    [--with-zlib-prefix=PREFIX],
>+    [path to zlib compression library]),
>+  [zlib_prefix="$withval"],
>+  [zlib_prefix="no"])
>+
>+if test x"$zlib_prefix" = "xno"; then
>+  ZLIB_LIBS="-lz"
>+else
>+  ZLIB_CPPFLAGS="-I$zlib_prefix/include"
>+  ZLIB_LIBS="-L$zlib_prefix/lib -lz"
>+fi
>+
>+ac_save_CPPFLAGS="$CPPFLAGS"
>+ac_save_LIBS="$LIBS"
>+CPPFLAGS="$CPPFLAGS $ZLIB_CPPFLAGS"
>+LIBS="$LIBS $ZLIB_LIBS"
>+
>+AC_CHECK_LIB(z, gzsetparams,
>+  [AC_CHECK_HEADER(zlib.h,
>+     have_zlib=yes)])
>+
>+CPPFLAGS="$ac_save_CPPFLAGS"
>+LIBS="$ac_save_LIBS"
>+
>+if test "x$have_zlib" != "xyes"; then
>+  AC_MSG_ERROR(zlib needed)
> fi
>-AM_CONDITIONAL(HAVE_ZLIB, [test x"$have_zlib" = "xyes"])
>-AC_SUBST(ZLIB_INCLUDES)
>+AC_SUBST(ZLIB_CPPFLAGS)
> AC_SUBST(ZLIB_LIBS)
>-AC_SUBST(ZLIB_LIBS_CONFIG)
>+
> 
> dnl ---------------------------------------------
> dnl check posix timers
>@@ -497,7 +523,9 @@
> 
> case "$host_or_hostalias" in
>   *linux* )
>-    have_syncfb="yes"
>+    AC_ARG_ENABLE([fb],
>+      AC_HELP_STRING([--disable-fb], [do not build syncfb plugins]),
>+      have_syncfb=$enableval, have_syncfb="yes")
>     ;;
>   *)
>     have_syncfb="no"
>@@ -1646,8 +1674,9 @@
> AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep lstat memset strchr])
> AC_FUNC_FSEEKO
> AC_DEFINE(_GNU_SOURCE)
>-AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h sys/times.h sys/ioctl.h)
>+AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h dirent.h sys/times.h sys/ioctl.h sys/param.h)
> AC_REPLACE_FUNCS(basename gettimeofday setenv strndup strpbrk strsep strtok_r)
>+AC_CHECK_FUNCS(readlink)
> 
> AC_LIBSOURCE(hstrerror.c)
> AC_LINK_IFELSE([#include <netdb.h>
>@@ -1661,6 +1690,15 @@
>   AC_LIBOBJ(hstrerror)
> fi
> 
>+AC_LIBSOURCE(dirent_msvc.c)
>+AC_CHECK_FUNC(opendir,
>+  [AC_DEFINE(HAVE_OPENDIR, 1, [Define to 1 if you have 'opendir' function])],
>+  [if test x"$SYS" = "xmingw32"; then
>+    AC_LIBOBJ(dirent_msvc)
>+  else
>+    AC_MSG_ERROR([dirent is needed (opendir, readdir, ...)])
>+  fi])
>+
> AH_BOTTOM([/* include internal system specific header */
> #include "os_internal.h"])
> 
>@@ -2152,26 +2190,41 @@
> if test "x$exec_prefix" = xNONE; then
>    exec_prefix='${prefix}'
> fi
>+
>+dnl
>+dnl installation directories and directories relative to prefix
>+dnl
>+dnl Note:
>+dnl   use AC_DEFINE for runtime
>+dnl   use AC_SUBST for installation
>+dnl
>+XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB"
>+XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
>+XINE_LOCALEDIR="${datadir}/locale"
>+eval XINE_REL_PLUGINDIR="$XINE_PLUGINDIR"
>+XINE_REL_PLUGINDIR=`eval echo "$XINE_REL_PLUGINDIR" | sed -e "s,^${prefix}/,,"`
>+XINE_REL_FONTDIR=`eval echo "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`
>+XINE_REL_LOCALEDIR=`eval echo "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`
>+if test x"$SYS" = "xmingw32"; then
>+  dnl polish paths (MinGW runtime accepts both \ and / anyway)
>+  XINE_REL_PLUGINDIR=`echo "$XINE_REL_PLUGINDIR" | sed -e 's/\\//\\\\\\\\/g'`
>+  XINE_REL_FONTDIR=`echo "$XINE_REL_FONTDIR" | sed -e 's/\\//\\\\\\\\/g'`
>+  XINE_REL_LOCALEDIR=`echo "$XINE_REL_LOCALEDIR" | sed -e 's/\\//\\\\\\\\/g'`
>+fi
> if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then
>-  dnl installation directories
>-  eval XINE_PLUGINDIR="${bindir}/plugins"
>-  eval XINE_FONTDIR="${bindir}/fonts"
>-  eval XINE_LOCALEDIR="${bindir}/locale"
>-  dnl directories from xine-config
>-  XINE_PLUGINPATH="\`dirname \$0\`/plugins"
>-  XINE_FONTPATH="\`dirname \$0\`/fonts"
>-  XINE_LOCALEPATH="\`dirname \$0\`/locale"
>-  dnl runtime directories
>-  AC_DEFINE(XINE_PLUGINDIR,[exec_path_append_subdir("plugins")],[Define this to plugins directory location])
>-  AC_DEFINE(XINE_FONTDIR,[exec_path_append_subdir("fonts")],[Define this to osd fonts dir location])
>-  AC_DEFINE(XINE_LOCALEDIR,[exec_path_append_subdir("locale")],[Path where catalog files will be.])
>   dnl prefix in xine-config
>   XINE_CONFIG_PREFIX="\`dirname \$0\`/.."
>+  dnl installation directories (in xine-config)
>+  XINE_PLUGINPATH="$XINE_CONFIG_PREFIX/$XINE_REL_PLUGINDIR"
>+  XINE_FONTPATH="$XINE_CONFIG_PREFIX/$XINE_REL_FONTDIR"
>+  XINE_LOCALEPATH="$XINE_CONFIG_PREFIX/$XINE_REL_LOCALEDIR"
>+  dnl runtime directories
>+  AC_DEFINE(XINE_PLUGINDIR,[xine_get_plugindir()],[Define this to plugins directory location])
>+  AC_DEFINE(XINE_FONTDIR,[xine_get_fontdir()],[Define this to osd fonts dir location])
>+  AC_DEFINE(XINE_LOCALEDIR,[xine_get_localedir()],[Path where catalog files will be.])
> else
>-  dnl installation directories
>-  XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB"
>-  XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
>-  XINE_LOCALEDIR="${datadir}/locale"
>+  dnl prefix in xine-config
>+  XINE_CONFIG_PREFIX="${prefix}"
>   dnl directories from xine-config and runtime directories
>   eval XINE_PLUGINPATH=`eval echo "$XINE_PLUGINDIR"`
>   eval XINE_FONTPATH="$XINE_FONTDIR"
>@@ -2180,9 +2233,10 @@
>   AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINPATH",[Define this to plugins directory location])
>   AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location])
>   AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.])
>-  dnl prefix in xine-config
>-  XINE_CONFIG_PREFIX="${prefix}"
> fi
>+AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to plugin directory relative to execution prefix])
>+AC_DEFINE_UNQUOTED(XINE_REL_FONTDIR,"$XINE_REL_FONTDIR",[Define this to font directory relative to prefix])
>+AC_DEFINE_UNQUOTED(XINE_REL_LOCALEDIR,"$XINE_REL_LOCALEDIR",[Define this to font directory relative to prefix])
> AC_SUBST(XINE_CONFIG_PREFIX)
> AC_SUBST(XINE_PLUGINPATH)
> AC_SUBST(XINE_FONTPATH)
>@@ -2230,7 +2284,7 @@
> dnl some include paths ( !!! DO NOT REMOVE !!! )
> dnl ---------------------------------------------
> 
>-INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_CPPFLAGS) $(THREAD_INCLUDES) $(ZLIB_INCLUDES) -I$(top_srcdir)/lib'
>+INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_CPPFLAGS) -I$(top_srcdir)/lib'
> AC_SUBST(INCLUDES)
> 
> 
>@@ -2398,9 +2452,6 @@
> src/xine-utils/Makefile
> src/xine-engine/Makefile
> win32/Makefile
>-win32/contrib/Makefile
>-win32/contrib/pthreads/Makefile
>-win32/contrib/zlib/Makefile
> win32/include/Makefile])
> AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
> AC_OUTPUT
>Index: doc/README.MINGWCROSS
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/doc/README.MINGWCROSS,v
>retrieving revision 1.1.2.1
>diff -u -r1.1.2.1 README.MINGWCROSS
>--- doc/README.MINGWCROSS	9 Feb 2005 19:38:46 -0000	1.1.2.1
>+++ doc/README.MINGWCROSS	8 Oct 2005 14:28:39 -0000
>@@ -21,8 +21,8 @@
> 
>     http://mingw.org/download.shtml
> 
>-    1) binutils (sources)
>-    2) gcc-core, gcc-c++ (sources)
>+    1) binutils (sources), binutils-build.sh
>+    2) gcc-core, gcc-c++ (sources), gcc-build.sh
>     3) w32api, mingw-runtime (binaries and sources)
> 
>   DirectX headers (tested with version 7):
>@@ -30,14 +30,22 @@
>     http://www.google.com/search?hl=cs&q=win32-dx7headers.tgz
>     http://www.google.com/search?q=dx7adxf.exe
> 
>+  Pthread Win32:
>+
>+    ftp://sources.redhat.com/pub/pthreads-win32/
>+
>+  zlib:
>+
>+    http://www.zlib.net
>+
> 
> Build
> -----
> 
>-In following text are used symbols PREFIX and USER with this meaning:
>+In following text are used symbols $PREFIX and $USER with this meaning:
> 
>-  PREFIX .... directory of the mingw cross environtment
>-  USER ...... current user
>+  $PREFIX .... directory of the mingw cross environtment
>+  $USER ...... current user
> 
> 
> 1. compile binutils
>@@ -47,14 +55,14 @@
>   cd bin
>   ../binutils-2.13.90-20030111-1-src/configure \
>     --target=i386-mingw32 \
>-    --prefix=PREFIX
>+    --prefix=$PREFIX
>   make
>   su
>   make install
>   exit
> 
> 
>-2. add PREFIX/bin into PATH
>+2. add $PREFIX/bin into PATH
> 
>   ...
> 
>@@ -66,8 +74,8 @@
>   # this commands ensure write permission to target
>   #
>   su
>-  chmod g+w PREFIX{/lib,/i386-mingw32{/,/lib}}
>-  chown root:USER PREFIX{/lib,/i386-mingw32{/,/lib}}
>+  chmod g+w $PREFIX{/lib,/i386-mingw32{/,/lib}}
>+  chown root:$USER $PREFIX{/lib,/i386-mingw32{/,/lib}}
>   exit
> 
>   #
>@@ -83,20 +91,22 @@
>   # compile and install the compiler
>   #
>   # if you'll want rerun this step, I recommend delete 
>-  # PREFIX/i386-mingw32/sys-include
>+  # $PREFIX/i386-mingw32/sys-include
>   #
>   tar xzf gcc-core-3.3.1-20030804-1-src.tar.gz
>   tar xzf gcc-g++-3.3.1-20030804-1-src.tar.gz
>   mkdir gcc-bin
>   cd gcc-bin 
>+  # more option may be needed for successfull compilation,
>+  # see gcc-3.3.1-1-build.sh
>   ../gcc-3.3.1-20030804-1/configure \
>     --disable-shared \
>-    --enable-static \
>     --target=i386-mingw32 \
>     --with-headers=../runtime/include \
>     --with-libs=../runtime/lib \
>-    --prefix=PREFIX
>+    --prefix=$PREFIX
>   make
>+  #or recommended: make CFLAGS=-O2 LDFLAGS=-s
>   su
>   make install
>   exit
>@@ -105,26 +115,26 @@
>   # set the permissions back
>   #
>   su
>-  chmod -R g-w PREFIX
>-  chown -R root:root PREFIX
>+  chmod -R g-w $PREFIX
>+  chown -R root:root $PREFIX
>   exit
> 
> 
> 4. recompile w32api and mingw-runtime from sources (optional)
>  
>   #
>-  # installing must be into PREFIX/i386-mingw32
>+  # installing must be into $PREFIX/i386-mingw32
>   #
>   tar xzf w32api-2.5-src.tar.gz
>   cd w32api-2.5
>-  ./configure --prefix=PREFIX/i386-mingw32 --host=i386-mingw32
>+  ./configure --prefix=$PREFIX/i386-mingw32 --host=i386-mingw32
>   make
>   su
>   make install
>   exit
> 
>   #
>-  # installing must be into PREFIX/i386-mingw32
>+  # installing must be into $PREFIX/i386-mingw32
>   #
>   tar xzf mingw-runtime-3.3-src.tar.gz
>   cd mingw-runtime-3.3
>@@ -137,7 +147,7 @@
>   AR=i386-mingw32-ar \
>   AS=i386-mingw32-as \
>   RANLIB=i386-mingw32-ranlib \
>-  ./configure --prefix=PREFIX/i386-mingw32 --target=i386-mingw32
>+  ./configure --prefix=$PREFIX/i386-mingw32 --target=i386-mingw32
>   make
>   su
>   make install
>@@ -145,17 +155,71 @@
> 
> 
> 5. install DirectX headers and other libraries
>+
>   su
>-  cd PREFIX/include
>-  # untar dx7headers.tar.gz
>+  cd $PREFIX/include
>+  # untar dx7headers.tar.gz (maybe to a subdirectory)
>   ...
>   exit
> 
> 
>+6. compile and install pthreads-win32
>+
>+  tar xzf pthreads-w32-2-7-0-release.tar.gz
>+  cd pthreads-w32-2-7-0-release/
>+  make CROSS=i386-mingw32- PTHREAD_DEF=pthreadGC2.def clean GC 
>+  #
>+  # possibility to use pthread library in M$ Visual C (optional)
>+  #
>+  mv pthread.def pthreadGC2.def
>+  wine LIB.EXE /machine:i386 /def:pthreadGC2.def
>+  #
>+  # installing
>+  #
>+  su
>+  mkdir -p $PREFIX/pthreads-win32/bin
>+  mkdir -p $PREFIX/pthreads-win32/include
>+  mkdir -p $PREFIX/pthreads-win32/lib
>+  cp pthreadGC2.dll $PREFIX/pthreads-win32/bin/
>+  cp libpthreadGC2.a pthreadGC2.lib $PREFIX/pthreads-win32/lib/
>+  ln -s libpthreadGC2.a $PREFIX/pthreads-win32/lib/libpthread.a
>+  ln -s pthreadGC2.lib $PREFIX/pthreads-win32/lib/pthread.lib
>+  cp pthread.h semaphore.h sched.h $PREFIX/pthreads-win32/include/
>+  exit
>+
>+
>+7. compile and install zlib
>+
>+  tar xjf zlib-1.2.3.tar.bz2
>+  cd zlib-1.2.3
>+  #
>+  # small workaround in Makefile:
>+  #
>+  sed -e 's/dllwrap /i386-mingw32-dllwrap /g' win32/Makefile.gcc > Makefile
>+  #
>+  # compiling
>+  #
>+  make CC=i386-mingw32-gcc AR=i386-mingw32-ar RC=i386-mingw32-windres STATICLIB=libz-static.a IMPLIB=libz.a
>+  #
>+  # possibility to use zlib library in M$ Visual C (optional)
>+  #
>+  cp win32/zlib.def zlib1.def
>+  wine LIB.EXE /machine:i386 /def:zlib1.def
>+  #
>+  # installing
>+  #
>+  su
>+  mkdir -p $PREFIX/zlib/{include,lib,bin}
>+  cp zconf.h zlib.h $PREFIX/zlib/include/
>+  cp libz.a libz-static.a zlib1.lib $PREFIX/zlib/lib/
>+  cp zlib1.dll $PREFIX/zlib/bin/
>+  exit
>+
>+
> Using MinGW cross development tools
> -----------------------------------
> 
>-We can build xine library for Windows by this way:
>+Now we can build xine library for Windows by this way:
> 
>   #
>   # configure for mingw cross compiling
>@@ -166,7 +230,9 @@
>     --build=i686-debian-linux \
>     --disable-freetype \
>     --disable-vcd \
>-    --with-dxheaders=/mingw32/include/dx7headers
>+    --with-dxheaders=$PREFIX/include/dx7headers \
>+    --with-zlib-prefix=$PREFIX/zlib \
>+    --with-pthread-prefix=$PREFIX/pthreads-win32
> 
>   #
>   # build system isn't fully prepared for cross compiling, so it's needed
>@@ -184,13 +250,13 @@
>   # install
>   #
>   make install DESTDIR=/tmp/xine-lib-mingwcross
>-  rm /tmp/xine-lib-mingwcross/bin/plugins{/,/post}/*.a
>+  rm /tmp/xine-lib-mingwcross/lib/xine/plugins/1.1.0{/,/post}/*.a
> 
>   #
>-  # if we want to use xine library in M$ compilers, we will need some tools from
>-  # M$ Visual C: LIB.EXE, LINK.EXE, MSPDB60.DLL and wine
>+  # if we want to use xine library in M$ compilers, we will need wine and some
>+  # tools from M$ Visual C: LIB.EXE, LINK.EXE, MSPDB60.DLL
>   #
>-  # create libxine-1.lib file
>+  # create libxine-1.lib file (optional)
>   #
>   cd <path_where_libxine_is_installed_>/lib
>   cp ../bin/libxine-1.dll .
>Index: doc/README.WIN32
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/doc/README.WIN32,v
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.2 README.WIN32
>--- doc/README.WIN32	20 Apr 2005 17:20:59 -0000	1.1.2.2
>+++ doc/README.WIN32	8 Oct 2005 14:28:40 -0000
>@@ -6,7 +6,7 @@
> 
> Download
> --------
>-Checkout source code from CVS (under Windows can be used CygWin or another tool). You will need 'xine-lib' (the library) and 'xine-win32' (testing Windows frontend).
>+Checkout source code from CVS (under Windows can be used CygWin or another tool). You will need 'xine-lib' (the library) and 'xine-win32' (testing Windows frontend). Instead xine-win32 you can use any other frontend working under Windows (toxine, ...)
> 
> 
> Build
>@@ -20,13 +20,13 @@
> 
> 1. MinGW port
> -------------
>-This is the best way. Final library is 100% native Windows with all optimizations.
>+This is the best way. Result is 100% native Windows library with all optimizations.
> 
> Also you can use cross-build from comfortable unix-like system. See README.MINGWCROSS for more information.
> 
> Requirements for compilation under Windows:
>-  a) MinGW installed on Windows
>-  b) LIB.EXE, LINK.EXE and MSPDB60.DLL from M$ Visual C 
>+  a) installed MinGW
>+  b) LIB.EXE, LINK.EXE and MSPDB60.DLL from M$ Visual C
>      (necessary only for usability created xine library by M$ compilers)
> 
> How to build:
>@@ -51,7 +51,7 @@
>     # run terminal window (MinGW for example)
>     ...
>     # creating libxine-1.lib file
>-    cd <path_where_libxine_is_installed_>/lib
>+    cd <path_where_libxine_is_installed>/lib
>     cp ../bin/libxine-1.dll .
>     <path_to_M$VC>/VC98/BIN/LIB.EXE /machine:i386 /def:libxine-1.def
>     rm libxine-1.dll
>@@ -59,7 +59,7 @@
> 
> 2. CygWin port
> --------------
>-This is the second way. Created library won't be 100% windows native: it will contains some additional emulation code and I'm not sure, if can be used with M$ compilers.
>+This is the second way. Created library won't be 100% windows native: it will contains some additional emulation code and I'm not sure, if it can be used with M$ compilers.
> 
> It's possible to use CygWin for cross-compiling with MinGW.
> 
>@@ -88,17 +88,27 @@
>  - can't compile included ffmpeg (important multi-decoder in xine)
>  - can't compile new assembler code (it means degradation of power)
>  - never 100% up to date
>- - somebody must buy the OS and compiler
>+ - somebody must own the OS and compiler
> 
> Reasons, why to use this port:
>- - obtaining backtrace after crash, debugging
>+ - obtaining cute backtrace after crash, debugging
> 
> How to build xine in M$ Visual C:
>   - Set up MSVC to look for DirectX headers.
> 
>-  - Open up the xine.dsw workspace/project in MSVC.
>+  - Download Pthreads Win32
>+    (ftp://sources.redhat.com/pub/pthreads-win32/), from prebuild directory
>+    install include/*.h, lib/pthreadVC2.lib and lib/pthreadVC2.dll,
>+    rename pthreadVC2.lib to pthread.lib
>+    set up MSVC - libraries and headers.
>+
>+  - Download zlib (http://www.zlib.net), instal all in include and lib,
>+    set up MSVC - libraries and headers.
> 
>-  - Unless you have a project file to build css you must select Cancel when prompted for the libdvdcss.dsp file.
>+  - Copy include/xine.h.in to include/xine.h, replace @text@ by right values
>+    (eg. XINE_MAJOR 1, XINE_MINOR 1, XINE_SUB 0, XINE_VERSION "1.1.0")
>+
>+  - Open up the xine.dsw workspace/project in MSVC.
> 
>   - Click on the FileView tab.
> 
>@@ -107,19 +117,20 @@
>     libxine
>     libdvdnav
> 
>-  - Next build any desired plugins (decoders/demuxers ...). The ao_out_directx and vo_out_directx are required for Win32. There is an option to use the vo_out_sdl but a sdl.dll must be present for that to take place. There have also been some issues observed with the directX video driver on some machines.
>+  - Next build any desired plugins (decoders/demuxers ...). The ao_out_directx2 and vo_out_directx are required for Win32. ao_out_directx is obsoleted. There is a possibility to use the vo_out_sdl but sdl.dll must be present for that to take place. There have also been some issues observed with the directX video driver on some machines.
> 
>   - If you want ffmpeg decoder plugin, you must use precompiled version. If you want to compile it, you should have the files LIB.EXE, LINK.EXE and MSPDB60.DLL from the Visual C++.
>     Under MinGW you can compile ffmpeg for xine by this way:
> 
>     #
>-    # run the script/patch necessary for MSVC a for xine
>+    # run the script/patch necessary for MSVC and for xine
>     #
>     cd ffmpeg
>     sh ../xine-lib/win32/scripts/ffmpeg_win32.patch
> 
>     #
>-    # for cross-compiling add "--cross-prefix=i386-mingw32-" and "--disable-mmx"
>+    # (for cross-compiling add "--cross-prefix=i386-mingw32-"
>+    #  and "--disable-mmx")
>     #
>     ./configure \
>        --enable-gpl \
>@@ -130,8 +141,8 @@
>     make
> 
>     #
>-    # for cross-compiling finalize linking by running this command in
>-    # libavcodec/ directory
>+    # linking by running this command in libavcodec/ directory (use wine for
>+    # cross-compiling)
>     #
>     # it's done automatically if you have 'LIB.EXE' linked to 'lib' in your
>     # $PATH and set wine
>@@ -151,13 +162,11 @@
> There remains many of work yet on Windows port.
> 
> Limitations:
>- - doesn't work under Win95/98 (DirectX? win32-pthreads?)
>  - file > 1GB doesn't work (MinGW problem?)
>- - missing full Win32 frontend
>  - build system isn't fully tuned for cross-compiling
>+ - seeking doesn't work with testing frontend, but it should be OK in library
> 
> Bugs:
>- - use GetCurrentDirectory(SIZE, STR) because of changing volume drive!
>- - random crashes
>- - seeking doesn't work with testing frontend
>+ - random crashes and random locks in stress tests
>  - non-seekable input plugins crash
>+ - ffmpeg bug visible for some video sizes
>Index: doc/hackersguide/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/doc/hackersguide/Makefile.am,v
>retrieving revision 1.26
>diff -u -r1.26 Makefile.am
>--- doc/hackersguide/Makefile.am	12 Sep 2004 16:01:15 -0000	1.26
>+++ doc/hackersguide/Makefile.am	8 Oct 2005 14:28:40 -0000
>@@ -29,7 +29,7 @@
> 
> clean-docs:
> 	rm -f $(docs_DATA)
>-	test "x$(srcdir)" = x. || rm -f $(hackersguide_sgml)
>+	test "x$(srcdir)" = x. || rm -f $(hackersguide_sgml) *.fig
> 
> dist-hook:
> 	@if test x"$(distcheck_lax)" = x ; then \
>Index: doc/hackersguide/output.sgml
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/doc/hackersguide/output.sgml,v
>retrieving revision 1.3
>diff -u -r1.3 output.sgml
>--- doc/hackersguide/output.sgml	8 May 2004 15:03:43 -0000	1.3
>+++ doc/hackersguide/output.sgml	8 Oct 2005 14:28:42 -0000
>@@ -357,7 +357,7 @@
>     Rewiring is the reconnection of one post plugin's outputs and another post plugin's
>     inputs. This can happen on the fly during playback, which makes this a very delicate
>     process. In one such input to output connection, only the output is active by either
>-    writing data directly to the connected intput or by calling functions there. Therefore
>+    writing data directly to the connected input or by calling functions there. Therefore
>     we have to notify only the output, when it is rewired. This is done by calling the
>     <function>rewire()</function> member function of the corresponding
>     <type>xine_post_out_t</type> when the frontend issues a rewiring on this output.
>Index: lib/os_internal.h
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/lib/os_internal.h,v
>retrieving revision 1.2
>diff -u -r1.2 os_internal.h
>--- lib/os_internal.h	12 Dec 2004 13:51:29 -0000	1.2
>+++ lib/os_internal.h	8 Oct 2005 14:28:42 -0000
>@@ -1,6 +1,35 @@
>+#ifndef _XINE_OS_INTERNAL_H
>+#define _XINE_OS_INTERNAL_H
>+
> #include <stddef.h>
> #include "os_types.h"
> 
>+
>+#if defined (__SVR4) && defined (__sun)
>+#  include <sys/int_types.h>
>+
>+/* maybe needed for FreeBSD 4-STABLE */
>+/* 
>+#elif defined (__FreeBSD__)
>+#  include <stdint.h>
>+*/
>+
>+#endif
>+
>+
>+#if defined(WIN32)
>+#  define XINE_DIRECTORY_SEPARATOR_STRING ";"
>+#  define XINE_DIRECTORY_SEPARATOR_CHAR ';'
>+#  define XINE_SUBDIRECTORY_SEPARATOR_STRING "\\"
>+#  define XINE_SUBDIRECTORY_SEPARATOR_CHAR '\\'
>+#else
>+#  define XINE_DIRECTORY_SEPARATOR_STRING ":"
>+#  define XINE_DIRECTORY_SEPARATOR_CHAR ':'
>+#  define XINE_SUBDIRECTORY_SEPARATOR_STRING "/"
>+#  define XINE_SUBDIRECTORY_SEPARATOR_CHAR '/'
>+#endif
>+
>+
> /* replacement of strndup */
> #ifndef HAVE_STRNDUP
> #define strndup(S, N) _xine_private_strndup((S), (N))
>@@ -55,15 +84,97 @@
> char *_xine_private_strsep(char **stringp, const char *delim);
> #endif
> 
>-/* replacing lstat by stat */
>-#ifndef HAVE_LSTAT
>-#  define lstat(FILENAME, BUF) stat((FILENAME), (BUF))
>-#endif
>-
> /* macross needed for MSVC */
> #ifdef _MSC_VER
> #  define snprintf _snprintf
> #  define vsnprintf _vsnprintf
> #  define strcasecmp _stricmp
> #  define strncasecmp _strnicmp
>+#  define M_PI 3.14159265358979323846
>+#endif
>+
>+#ifdef WIN32
>+#  include <io.h>
>+#  ifdef _MSC_VER
>+#    include <direct.h>
>+#  else
>+#    define mkdir(A, B) _mkdir((A))
>+#  endif
>+
>+#  ifndef S_ISDIR
>+#    define S_ISDIR(m) ((m) & _S_IFDIR)
>+#  endif
>+
>+#  ifndef S_ISREG
>+#    define S_ISREG(m) ((m) & _S_IFREG)
>+#  endif
>+
>+#  ifndef S_ISBLK
>+#    define S_ISBLK(m) 0
>+#  endif
>+
>+#  ifndef S_ISCHR
>+#    define S_ISCHR(m) 0
>+#  endif
>+
>+#  ifndef S_ISLNK
>+#    define S_ISLNK(mode)  0
>+#  endif
>+
>+#  ifndef S_ISSOCK
>+#    define S_ISSOCK(mode) 0
>+#  endif
>+
>+#  ifndef S_ISFIFO
>+#    define S_ISFIFO(mode) 0
>+#  endif
>+
>+#  ifndef S_IXUSR
>+#    define S_IXUSR S_IEXEC
>+#  endif
>+
>+#  ifndef S_IXGRP
>+#    define S_IXGRP S_IEXEC
>+#  endif
>+
>+#  ifndef S_IXOTH
>+#    define S_IXOTH S_IEXEC
>+#  endif
>+
>+#  if !S_IXUGO
>+#    define S_IXUGO (S_IXUSR | S_IXGRP | S_IXOTH)
>+#  endif
>+
>+#endif
>+
>+#ifndef HAVE_READLINK
>+#  define readlink(PATH, BUF, BUFSIZE) 0
>+#endif
>+
>+/* replacing lstat by stat */
>+#ifndef HAVE_LSTAT
>+#  define lstat(FILENAME, BUF) stat((FILENAME), (BUF))
>+#endif
>+
>+/* replacements of dirent for MSVC platform */
>+#ifndef HAVE_OPENDIR
>+typedef struct DIR DIR;
>+
>+struct dirent {
>+  unsigned short d_reclen;
>+  char *d_name;
>+};
>+
>+DIR           *_xine_private_opendir(const char *);
>+int           _xine_private_closedir(DIR *);
>+struct dirent *_xine_private_readdir(DIR *);
>+void          _xine_private_rewinddir(DIR *);
>+
>+#define opendir(DIRENT_NAME) _xine_private_opendir((DIRENT_NAME))
>+#define closedir(DIRENT_DIR) _xine_private_closedir((DIRENT_DIR))
>+#define readdir(DIRENT_DIR) _xine_private_readdir((DIRENT_DIR))
>+#define rewinddir(DIRENT_DIR) _xine_private_rewinddir((DIRENT_DIR))
>+
>+#endif
>+
> #endif
>Index: lib/setenv.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/lib/setenv.c,v
>retrieving revision 1.1
>diff -u -r1.1 setenv.c
>--- lib/setenv.c	20 Sep 2004 19:30:03 -0000	1.1
>+++ lib/setenv.c	8 Oct 2005 14:28:43 -0000
>@@ -2,7 +2,6 @@
> 
> #include <stdlib.h>
> #include <string.h>
>-#include <malloc.h>
> #include <stdio.h>
> 
> /* This function will leak a small amount of memory */
>Index: lib/strndup.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/lib/strndup.c,v
>retrieving revision 1.3
>diff -u -r1.3 strndup.c
>--- lib/strndup.c	23 Sep 2004 16:11:47 -0000	1.3
>+++ lib/strndup.c	8 Oct 2005 14:28:43 -0000
>@@ -1,9 +1,5 @@
> #include "config.h"
> 
>-#ifdef HAVE_MALLOC_H
>-#include <malloc.h>
>-#endif
>-
> #ifdef HAVE_STDLIB_H
> #include <stdlib.h>
> #endif
>Index: m4/ffmpeg.m4
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/m4/ffmpeg.m4,v
>retrieving revision 1.4
>diff -u -r1.4 ffmpeg.m4
>--- m4/ffmpeg.m4	24 Sep 2004 19:24:27 -0000	1.4
>+++ m4/ffmpeg.m4	8 Oct 2005 14:28:43 -0000
>@@ -75,13 +75,17 @@
>         AC_CHECK_LIB(postproc, pp_get_context, 
>           AC_CHECK_LIB(avcodec, register_avcodec,
>             [external_ffmpeg_found=yes
>-            FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec -lpostproc"
>+            FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS} -lpostproc"
>+            FFMPEG_LIBS="${FFMPEG_LIBS} -lavcodec"
>             break]
>           ),,
>           [-lavcodec]
>         )
>       done
>-  
>+      if test x$FFMPEG_POSTPROC_LIBS = "x"; then
>+        FFMPEG_POSTPROC_LIBS="${FFMPEG_LIBS}"
>+      fi
>+
>       dnl result of autodetection
>       if test x"$external_ffmpeg_found" = "xyes"; then
>         AC_MSG_RESULT([External ffmpeg library was found in ${dir}.])
>@@ -99,7 +103,7 @@
>     else
>       dnl check specified flags
>       CPPFLAGS="${FFMPEG_CPPFLAGS} ${ac_save_CPPFLAGS}"
>-      LDFLAGS="${FFMPEG_LIBS} ${ac_save_LDFLAGS}"
>+      LDFLAGS="${FFMPEG_LIBS} ${FFMPEG_POSTPROC_LIBS } ${ac_save_LDFLAGS}"
>       AC_LINK_IFELSE([#include <avcodec.h>
> #include <postprocess.h>
>  
>@@ -158,6 +162,7 @@
>   
>   AC_SUBST(FFMPEG_CPPFLAGS)
>   AC_SUBST(FFMPEG_LIBS)
>+  AC_SUBST(FFMPEG_POSTPROC_LIBS)
>   
> else
>   AC_MSG_RESULT([using included ffmpeg])
>Index: m4/xine.m4
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/m4/xine.m4,v
>retrieving revision 1.18
>diff -u -r1.18 xine.m4
>--- m4/xine.m4	5 Mar 2004 16:34:32 -0000	1.18
>+++ m4/xine.m4	8 Oct 2005 14:28:44 -0000
>@@ -210,4 +210,6 @@
> dnl Make sure HAVE_STRSEP, HAVE_SETENV and HAVE_STRPBRK are defined as
> dnl necessary.
>   AC_CHECK_FUNCS([strsep strpbrk setenv])
>+dnl alloca (in public macro) and MinGW
>+  AC_CHECK_HEADERS([malloc.h])
> ])
>Index: misc/libxine.pc.in
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/misc/libxine.pc.in,v
>retrieving revision 1.3
>diff -u -r1.3 libxine.pc.in
>--- misc/libxine.pc.in	1 Sep 2004 18:19:49 -0000	1.3
>+++ misc/libxine.pc.in	8 Oct 2005 14:28:44 -0000
>@@ -7,5 +7,5 @@
> Description: The xine engine library
> Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@
> Requires:
>-Libs: -L${libdir} -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@
>-Cflags: -I${includedir} @THREAD_CFLAGS_CONFIG@
>+Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@
>+Cflags: -I${includedir} @THREAD_CPPFLAGS@
>Index: misc/xine-config.in
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/misc/xine-config.in,v
>retrieving revision 1.27
>diff -u -r1.27 xine-config.in
>--- misc/xine-config.in	3 Nov 2004 18:58:29 -0000	1.27
>+++ misc/xine-config.in	8 Oct 2005 14:28:44 -0000
>@@ -100,11 +100,11 @@
> fi
> 
> if test "$echo_cflags" = "yes"; then
>-      echo -I@includedir@ @THREAD_CFLAGS_CONFIG@
>+      echo -I@includedir@ @THREAD_CPPFLAGS@
> fi
> 
> if test "$echo_libs" = "yes"; then
>-      echo -L@libdir@ -lxine @ZLIB_LIBS_CONFIG@ @NET_LIBS@ @THREAD_LIBS_CONFIG@ @LIBICONV@ @RT_LIBS@
>+      echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@
> fi      
> if test "$echo_plugindir" = "yes"; then
>       echo "@XINE_PLUGINPATH@"
>Index: src/audio_out/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/audio_out/Makefile.am,v
>retrieving revision 1.52.2.1
>diff -u -r1.52.2.1 Makefile.am
>--- src/audio_out/Makefile.am	9 Feb 2005 19:39:04 -0000	1.52.2.1
>+++ src/audio_out/Makefile.am	8 Oct 2005 14:28:44 -0000
>@@ -123,5 +123,5 @@
> 
> xineplug_ao_out_directx2_la_SOURCES = audio_directx2_out.c
> xineplug_ao_out_directx2_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
>-xineplug_ao_out_directx2_la_LIBADD = $(XINE_LIB) $(DIRECTX_AUDIO_LIBS)
>+xineplug_ao_out_directx2_la_LIBADD = $(XINE_LIB) $(DIRECTX_AUDIO_LIBS) $(THREAD_LIBS)
> xineplug_ao_out_directx2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
>Index: src/audio_out/audio_directx2_out.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/audio_out/audio_directx2_out.c,v
>retrieving revision 1.2.2.2
>diff -u -r1.2.2.2 audio_directx2_out.c
>--- src/audio_out/audio_directx2_out.c	17 Jul 2005 21:49:40 -0000	1.2.2.2
>+++ src/audio_out/audio_directx2_out.c	8 Oct 2005 14:28:46 -0000
>@@ -129,7 +129,7 @@
>   int paused;                      /* paused mode */
>   int finished;                    /* driver finished */
>   int failed;                      /* don't open modal dialog again */
>-  int count;                       /* number of current free parts */
>+  int count;                       /* current free part number */
> 
>   pthread_t buffer_service;        /* service thread for operating with DSB */
>   pthread_cond_t data_cond;        /* signals on data */
>@@ -176,7 +176,7 @@
>     case DSERR_BUFFERLOST: return _("memory buffer has been lost and must be restored");
>     case DSERR_CONTROLUNAVAIL: return _("requested buffer control is not available");
>     case DSERR_GENERIC: return _("undetermined error inside DirectSound subsystem");
>-#ifdef HWUNAVAIL
>+#ifdef DSERR_HWUNAVAIL
>     case DSERR_HWUNAVAIL: return _("DirectSound hardware device is unavailable");
> #endif
>     case DSERR_INVALIDCALL: return _("function is not valid for the current state of the object");
>Index: src/demuxers/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/demuxers/Makefile.am,v
>retrieving revision 1.105.2.2
>diff -u -r1.105.2.2 Makefile.am
>--- src/demuxers/Makefile.am	17 Jul 2005 21:49:40 -0000	1.105.2.2
>+++ src/demuxers/Makefile.am	8 Oct 2005 14:28:46 -0000
>@@ -1,6 +1,7 @@
> include $(top_srcdir)/misc/Makefile.common
> 
> AM_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) $(SPEEX_CFLAGS) $(LIBMODPLUG_CFLAGS)
>+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
> 
> libdir = $(XINE_PLUGINDIR)
> 
>Index: src/demuxers/demux_wc3movie.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_wc3movie.c,v
>retrieving revision 1.52
>diff -u -r1.52 demux_wc3movie.c
>--- src/demuxers/demux_wc3movie.c	13 Jun 2004 21:28:55 -0000	1.52
>+++ src/demuxers/demux_wc3movie.c	8 Oct 2005 14:28:48 -0000
>@@ -173,11 +173,13 @@
>         this->seek_flag = 0;
>       } else {
>         /* record the offset of the SHOT chunk */
>-        this->shot_offsets[this->current_shot] =
>-          this->input->get_current_pos(this->input) - PREAMBLE_SIZE;
>+        if (this->current_shot < this->number_of_shots) {
>+	  this->shot_offsets[this->current_shot] =
>+            this->input->get_current_pos(this->input) - PREAMBLE_SIZE;
>+        }
>       }
>       this->current_shot++;
>-
>+      
>       /* this is the start of a new shot; send a new palette */
>       if (this->input->read(this->input, preamble, 4) != 4) {
>         this->status = DEMUX_FINISHED;
>@@ -376,7 +378,7 @@
>   if (this->input->read(this->input, preamble, 4) != 4)
>     return 0;
>   this->number_of_shots = LE_32(&preamble[0]);
>-
>+  
>   /* allocate space for the shot offset index and set offsets to 0 */
>   this->shot_offsets = xine_xmalloc(this->number_of_shots * sizeof(off_t));
>   this->current_shot = 0;
>@@ -579,6 +581,15 @@
>     /* if the next shot offset has not been recorded, traverse through the 
>      * file until it is found */
>     if (this->shot_offsets[i + 1] == 0) {
>+      off_t current_pos;
>+
>+      /* be sure to be just after the last known shot_offset */
>+      current_pos = this->input->get_current_pos(this->input);
>+      if (current_pos < this->shot_offsets[i]) {
>+	this->input->seek(this->input,
>+			  this->shot_offsets[i] + PREAMBLE_SIZE + 4,
>+			  SEEK_SET);
>+      }
> 
>       while (1) {
> 
>Index: src/input/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/Makefile.am,v
>retrieving revision 1.82
>diff -u -r1.82 Makefile.am
>--- src/input/Makefile.am	30 Oct 2004 16:14:33 -0000	1.82
>+++ src/input/Makefile.am	8 Oct 2005 14:28:48 -0000
>@@ -44,7 +44,8 @@
> endif
> 
> # not ported to native Windows
>-if !WIN32
>+if WIN32
>+else
> in_rtp = xineplug_inp_rtp.la
> in_dvb = xineplug_inp_dvb.la 
> endif
>@@ -75,15 +76,15 @@
> xineplug_inp_file_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c
>-xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
>+xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(THREAD_LIBS)
> xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c
>-xineplug_inp_net_la_LIBADD = $(XINE_LIB)
>+xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_net_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c http_helper.c
>-xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@
>+xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@ $(THREAD_LIBS)
> xineplug_inp_mms_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
>@@ -91,27 +92,27 @@
> xineplug_inp_vcdo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
>-xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB)
>+xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_rtp_la_SOURCES = input_rtp.c net_buf_ctrl.c
>-xineplug_inp_rtp_la_LIBADD = $(XINE_LIB)
>+xineplug_inp_rtp_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c http_helper.c
>-xineplug_inp_http_la_LIBADD = $(XINE_LIB)
>+xineplug_inp_http_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_http_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_pnm_la_SOURCES = input_pnm.c net_buf_ctrl.c pnm.c
>-xineplug_inp_pnm_la_LIBADD = $(XINE_LIB)
>+xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_pnm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c
>-xineplug_inp_dvb_la_LIBADD = $(XINE_LIB)
>+xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_dvb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c
>-xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) libreal/libreal.la librtsp/librtsp.la
>+xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS) libreal/libreal.la librtsp/librtsp.la
> xineplug_inp_rtsp_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h
>@@ -123,7 +124,7 @@
> xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c
>-xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB)
>+xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB) $(THREAD_LIBS)
> xineplug_inp_gnome_vfs_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_inp_smb_la_SOURCES = input_smb.c
>Index: src/input/input_cdda.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/input_cdda.c,v
>retrieving revision 1.69.2.2
>diff -u -r1.69.2.2 input_cdda.c
>--- src/input/input_cdda.c	17 Jul 2005 21:49:58 -0000	1.69.2.2
>+++ src/input/input_cdda.c	8 Oct 2005 14:28:53 -0000
>@@ -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.
>  *
>@@ -32,7 +32,12 @@
> #include <unistd.h>
> 
> #include <sys/types.h>
>+#ifdef SYS_PARAM_H
>+#include <sys/param.h>
>+#endif
>+#ifdef HAVE_DIRENT_H
> #include <dirent.h>
>+#endif
> #include <sys/stat.h>
> #include <fcntl.h>
> #include <errno.h>
>@@ -684,18 +689,26 @@
>   unsigned char *data) {
> 
>   int fd = this_gen->fd;
>+#if  __FreeBSD_version < 501106
>   struct ioc_read_audio cdda;
>+#endif
> 
>   while( num_frames ) {
>+#if  __FreeBSD_version < 501106
>     cdda.address_format = CD_MSF_FORMAT;
>     cdda.address.msf.minute = frame / CD_SECONDS_PER_MINUTE / CD_FRAMES_PER_SECOND;
>     cdda.address.msf.second = (frame / CD_FRAMES_PER_SECOND) % CD_SECONDS_PER_MINUTE;
>     cdda.address.msf.frame = frame % CD_FRAMES_PER_SECOND;
>     cdda.nframes = 1;
>     cdda.buffer = data;
>+#endif
> 
>+#if  __FreeBSD_version >= 501106
>+    if (pread(fd, data, CD_RAW_FRAME_SIZE, frame * CD_RAW_FRAME_SIZE) != CD_RAW_FRAME_SIZE) {
>+#else
>     /* read a frame */
>     if(ioctl(fd, CDIOCREADAUDIO, &cdda) < 0) {
>+#endif
>       perror("CDIOCREADAUDIO");
>       return -1;
>     }
>@@ -1473,7 +1486,7 @@
>     return;
>   }
>   else {
>-    fprintf(fd, filecontent);
>+    fprintf(fd, "%s", filecontent);
>     fclose(fd);
>   }
>   
>Index: src/input/input_dvb.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/input_dvb.c,v
>retrieving revision 1.64.2.2
>diff -u -r1.64.2.2 input_dvb.c
>--- src/input/input_dvb.c	20 Apr 2005 17:21:07 -0000	1.64.2.2
>+++ src/input/input_dvb.c	8 Oct 2005 14:28:59 -0000
>@@ -88,7 +88,9 @@
> #endif
> #include <sys/poll.h>
> #include <time.h>
>+#ifdef HAVE_DIRENT_H
> #include <dirent.h>
>+#endif
> #include <ctype.h>
> 
> /* These will eventually be #include <linux/dvb/...> */
>@@ -2098,6 +2100,8 @@
>  char dates[64];
>  int x=0;
>  xine_cfg_entry_t savedir;
>+ DIR *dir;
>+
>  if (this->record_fd > -1) {
> 
>     /* stop recording */
>@@ -2120,10 +2124,11 @@
>     
>     if (xine_config_lookup_entry(this->stream->xine, "media.capture.save_dir", &savedir)){
>       if(strlen(savedir.str_value)>1){
>-        if(opendir(savedir.str_value)==NULL){
>+        if((dir = opendir(savedir.str_value))==NULL){
>           snprintf (filename, 256, "%s/%s_%s.ts",xine_get_homedir(),this->channels[this->channel].name, dates);
>           xprintf(this->class->xine,XINE_VERBOSITY_LOG,"savedir is wrong... saving to home directory\n");
>         } else {
>+          closedir(dir);
>           snprintf (filename, 256, "%s/%s_%s.ts",savedir.str_value,this->channels[this->channel].name, dates);
>           xprintf(this->class->xine,XINE_VERBOSITY_LOG,"saving to savedir\n");
>         }
>Index: src/input/input_dvd.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/input_dvd.c,v
>retrieving revision 1.195.2.3
>diff -u -r1.195.2.3 input_dvd.c
>--- src/input/input_dvd.c	17 Jul 2005 21:49:58 -0000	1.195.2.3
>+++ src/input/input_dvd.c	8 Oct 2005 14:29:02 -0000
>@@ -1,5 +1,5 @@
> /* 
>- * Copyright (C) 2000-2004 the xine project, 
>+ * Copyright (C) 2000-2005 the xine project, 
>  *                         Rich Wareham <richwareham@users.sourceforge.net>
>  * 
>  * This file is part of xine, a free video player.
>@@ -47,7 +47,6 @@
> 
> #include <sys/types.h>
> #include <sys/stat.h>
>-#include <dirent.h>
> 
> #include <unistd.h>
> #include <fcntl.h>
>Index: src/input/input_file.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/input_file.c,v
>retrieving revision 1.98.2.2
>diff -u -r1.98.2.2 input_file.c
>--- src/input/input_file.c	17 Jul 2005 21:49:59 -0000	1.98.2.2
>+++ src/input/input_file.c	8 Oct 2005 14:29:04 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2000-2003 the xine project
>+ * Copyright (C) 2000-2005 the xine project
>  * 
>  * This file is part of xine, a free video player.
>  * 
>@@ -26,7 +26,9 @@
> 
> #include <stdio.h>
> #include <stdlib.h>
>+#ifdef HAVE_DIRENT_H
> #include <dirent.h>
>+#endif
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
>Index: src/input/input_pvr.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/input_pvr.c,v
>retrieving revision 1.52.2.1
>diff -u -r1.52.2.1 input_pvr.c
>--- src/input/input_pvr.c	20 Apr 2005 17:21:08 -0000	1.52.2.1
>+++ src/input/input_pvr.c	8 Oct 2005 14:29:07 -0000
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2000-2004 the xine project
>+ * Copyright (C) 2000-2005 the xine project
>  * March 2003 - Miguel Freitas
>  * This plugin was sponsored by 1Control
>  *
>@@ -91,7 +91,6 @@
> 
> #include <stdio.h>
> #include <stdlib.h>
>-#include <dirent.h>
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
>Index: src/input/mmsh.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/input/mmsh.c,v
>retrieving revision 1.33.2.1
>diff -u -r1.33.2.1 mmsh.c
>--- src/input/mmsh.c	15 Jan 2005 17:51:41 -0000	1.33.2.1
>+++ src/input/mmsh.c	8 Oct 2005 14:29:09 -0000
>@@ -492,8 +492,8 @@
> 
>         this->packet_length = LE_32(this->asf_header + i + 92 - 24);
>         this->file_length   = LE_64(this->asf_header + i + 40 - 24);
>-        lprintf ("file object, file_length = %lld, packet length = %d",
>-		 this->file_length, this->packet_count);
>+        /*lprintf ("file object, file_length = %lld, packet length = %d",
>+		 this->file_length, this->packet_count);*/
>         break;
> 
>       case GUID_ASF_STREAM_PROPERTIES:
>Index: src/libffmpeg/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/Makefile.am,v
>retrieving revision 1.39
>diff -u -r1.39 Makefile.am
>--- src/libffmpeg/Makefile.am	27 Aug 2004 19:33:21 -0000	1.39
>+++ src/libffmpeg/Makefile.am	8 Oct 2005 14:29:10 -0000
>@@ -1,7 +1,7 @@
> include $(top_srcdir)/misc/Makefile.common
> 
> if HAVE_FFMPEG
>-FF_CPPFLAGS = $(FFMPEG_CPPFLAGS)
>+ff_cppflags = $(FFMPEG_CPPFLAGS)
> link_ffmpeg = $(FFMPEG_LIBS)
> else
> link_ffmpeg = \
>@@ -20,7 +20,8 @@
> lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
> 
> if HAVE_DXR3
>-AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(FF_CPPFLAGS)
>+AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \
>+              $(ZLIB_CPPFLAGS)
> xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
>                                 xine_encoder.c mpeg_parser.c
> # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and
>@@ -28,14 +29,14 @@
> # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@
> xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
> else
>-AM_CPPFLAGS = $(FF_CPPFLAGS)
>+AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
> xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
>                                 mpeg_parser.c
> 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
>Index: src/libffmpeg/dvaudio_decoder.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/dvaudio_decoder.c,v
>retrieving revision 1.6
>diff -u -r1.6 dvaudio_decoder.c
>--- src/libffmpeg/dvaudio_decoder.c	16 Dec 2004 13:58:57 -0000	1.6
>+++ src/libffmpeg/dvaudio_decoder.c	8 Oct 2005 14:29:10 -0000
>@@ -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.
>  * 
>@@ -31,7 +31,6 @@
> #include <stdio.h>
> #include <inttypes.h>
> #include <string.h>
>-#include <pthread.h>
> #include <math.h>
> 
> #define LOG_MODULE "dvaudio"
>Index: src/libffmpeg/libavcodec/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/Makefile.am,v
>retrieving revision 1.61
>diff -u -r1.61 Makefile.am
>--- src/libffmpeg/libavcodec/Makefile.am	21 Jun 2004 16:37:00 -0000	1.61
>+++ src/libffmpeg/libavcodec/Makefile.am	8 Oct 2005 14:29:13 -0000
>@@ -10,6 +10,7 @@
> # otherwise we get unresolved symbols, because some unsatisfied function calls
> # are not optimized away with debug optimization
> AM_CFLAGS = $(LIBFFMPEG_CFLAGS) `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
>+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
> ASFLAGS =
> 
> noinst_LTLIBRARIES = libavcodec.la
>Index: src/libspudec/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/libspudec/Makefile.am,v
>retrieving revision 1.25
>diff -u -r1.25 Makefile.am
>--- src/libspudec/Makefile.am	20 May 2003 13:50:55 -0000	1.25
>+++ src/libspudec/Makefile.am	8 Oct 2005 14:29:15 -0000
>@@ -10,7 +10,7 @@
> 	spu.c \
> 	xine_decoder.c
> AM_CPPFLAGS = $(DVDNAV_CFLAGS)
>-xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
>+xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) $(THREAD_LIBS)
> 
> else
> 
>@@ -19,7 +19,7 @@
> 	spu.c \
> 	xine_decoder.c
> AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
>-xineplug_decode_spu_la_LIBADD = $(XINE_LIB)
>+xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> 
> endif
> 
>Index: src/libspudvb/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/libspudvb/Makefile.am,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile.am
>--- src/libspudvb/Makefile.am	1 Dec 2004 07:27:35 -0000	1.1
>+++ src/libspudvb/Makefile.am	8 Oct 2005 14:29:15 -0000
>@@ -5,5 +5,5 @@
> lib_LTLIBRARIES = xineplug_decode_spudvb.la
> 
> xineplug_decode_spudvb_la_SOURCES = xine_decoder.c
>-xineplug_decode_spudvb_la_LIBADD  = $(XINE_LIB)
>+xineplug_decode_spudvb_la_LIBADD  = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_decode_spudvb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
>Index: src/post/audio/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/audio/Makefile.am,v
>retrieving revision 1.5.2.1
>diff -u -r1.5.2.1 Makefile.am
>--- src/post/audio/Makefile.am	17 Jul 2005 21:50:05 -0000	1.5.2.1
>+++ src/post/audio/Makefile.am	8 Oct 2005 14:29:15 -0000
>@@ -8,6 +8,6 @@
> 
> xineplug_post_audio_filters_la_SOURCES = \
>         upmix.c upmix_mono.c filter.c window.c stretch.c audio_filters.c
>-xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB)
>+xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_post_audio_filters_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm
> 
>Index: src/post/deinterlace/xine_plugin.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/deinterlace/xine_plugin.c,v
>retrieving revision 1.37
>diff -u -r1.37 xine_plugin.c
>--- src/post/deinterlace/xine_plugin.c	29 Sep 2004 18:30:37 -0000	1.37
>+++ src/post/deinterlace/xine_plugin.c	8 Oct 2005 14:29:18 -0000
>@@ -421,6 +421,7 @@
> 
>   if (_x_post_dispose(this_gen)) {
>     _flush_frames(this);
>+    pthread_mutex_destroy(&this->lock);
>     free(this);
>   }
> }
>Index: src/post/goom/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/goom/Makefile.am,v
>retrieving revision 1.21
>diff -u -r1.21 Makefile.am
>--- src/post/goom/Makefile.am	21 Nov 2004 15:10:40 -0000	1.21
>+++ src/post/goom/Makefile.am	8 Oct 2005 14:29:18 -0000
>@@ -25,7 +25,7 @@
> 	gfontlib.c gfontrle.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c \
> 	goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c mathtools.c \
> 	plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c
>-xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS)
>+xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS)
> xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
> 
> noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h gfontrle.h goom.h \
>Index: src/post/goom/diff_against_release.patch
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/goom/diff_against_release.patch,v
>retrieving revision 1.1.2.1
>diff -u -r1.1.2.1 diff_against_release.patch
>--- src/post/goom/diff_against_release.patch	17 Jul 2005 21:50:05 -0000	1.1.2.1
>+++ src/post/goom/diff_against_release.patch	8 Oct 2005 14:29:18 -0000
>@@ -24,6 +24,17 @@
>  /*	FVAL(data->factor_p) = data->factor / MAX;*/
> --- filters.c	2004-09-10 17:10:39.000000000 +0200
> +++ filters.c	2004-11-21 15:37:55.000000000 +0100
>+@@ -201,8 +201,8 @@
>+     /* Noise */
>+     if (data->noisify)
>+     {
>+-        vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>+-        vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>++        vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>++        vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>+     }
>+     
>+     /* Hypercos */
> @@ -705,7 +705,7 @@
>      
>      data->general_speed = 0.0f;
>Index: src/post/goom/filters.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/goom/filters.c,v
>retrieving revision 1.16.2.1
>diff -u -r1.16.2.1 filters.c
>--- src/post/goom/filters.c	17 Jul 2005 21:50:06 -0000	1.16.2.1
>+++ src/post/goom/filters.c	8 Oct 2005 14:29:19 -0000
>@@ -201,8 +201,8 @@
>     /* Noise */
>     if (data->noisify)
>     {
>-        vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>-        vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>+        vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>+        vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
>     }
>     
>     /* Hypercos */
>Index: src/post/mosaico/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/mosaico/Makefile.am,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile.am
>--- src/post/mosaico/Makefile.am	7 Aug 2003 09:26:53 -0000	1.4
>+++ src/post/mosaico/Makefile.am	8 Oct 2005 14:29:20 -0000
>@@ -5,9 +5,9 @@
> lib_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
> 
> xineplug_post_mosaico_la_SOURCES = mosaico.c
>-xineplug_post_mosaico_la_LIBADD = $(XINE_LIB)
>+xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_post_mosaico_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_post_switch_la_SOURCES = switch.c
>-xineplug_post_switch_la_LIBADD = $(XINE_LIB)
>+xineplug_post_switch_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_post_switch_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
>Index: src/post/planar/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/planar/Makefile.am,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile.am
>--- src/post/planar/Makefile.am	26 Apr 2004 15:38:18 -0000	1.11
>+++ src/post/planar/Makefile.am	8 Oct 2005 14:29:20 -0000
>@@ -1,7 +1,17 @@
> include $(top_srcdir)/misc/Makefile.common
> 
>-AM_CFLAGS = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
>-POSTPROC_LIB  = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
>+POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
>+
>+if HAVE_FFMPEG
>+postproc_lib = $(FFMPEG_POSTPROC_LIBS)
>+ff_cppflags = $(FFMPEG_CPPFLAGS)
>+else
>+ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
>+postproc_lib = $(POSTPROC_INT_LIB)
>+postproc_dep = $(postproc_lib)
>+endif
>+
>+AM_CPPFLAGS = $(ff_cppflags)
> 
> libdir = $(XINE_PLUGINDIR)/post
> 
>@@ -9,9 +19,9 @@
> 
> xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c boxblur.c \
>                                   denoise3d.c eq.c eq2.c unsharp.c pp.c
>-xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_LIB)
>-xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm
>+xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep)
>+xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS)
> xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
>-$(POSTPROC_LIB):
>+$(POSTPROC_INT_LIB):
> 	cd $(top_builddir)/src/libffmpeg/libavcodec/libpostproc && $(MAKE) libpostprocess.la
>Index: src/post/visualizations/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/post/visualizations/Makefile.am,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile.am
>--- src/post/visualizations/Makefile.am	30 Oct 2003 22:40:53 -0000	1.7
>+++ src/post/visualizations/Makefile.am	8 Oct 2005 14:29:20 -0000
>@@ -8,7 +8,7 @@
> 
> xineplug_post_visualizations_la_SOURCES = \
>         visualizations.c fft.c fftscope.c oscope.c fftgraph.c
>-xineplug_post_visualizations_la_LIBADD = $(XINE_LIB)
>+xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
> xineplug_post_visualizations_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm
> 
> noinst_HEADERS = fft.h visualizations.h
>Index: src/video_out/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/video_out/Makefile.am,v
>retrieving revision 1.109.2.1
>diff -u -r1.109.2.1 Makefile.am
>--- src/video_out/Makefile.am	25 Apr 2005 14:43:15 -0000	1.109.2.1
>+++ src/video_out/Makefile.am	8 Oct 2005 14:29:20 -0000
>@@ -162,7 +162,7 @@
> 
> xineplug_vo_out_directx_la_SOURCES = alphablend.c yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c 
> xineplug_vo_out_directx_la_CPPFLAGS = $(DIRECTX_CPPFLAGS)
>-xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB)
>+xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(THREAD_LIBS)
> xineplug_vo_out_directx_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
> 
> xineplug_vo_out_none_la_SOURCES =  video_out_none.c
>Index: src/video_out/video_out_directx.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_directx.c,v
>retrieving revision 1.21
>diff -u -r1.21 video_out_directx.c
>--- src/video_out/video_out_directx.c	1 Dec 2004 07:23:55 -0000	1.21
>+++ src/video_out/video_out_directx.c	8 Oct 2005 14:29:22 -0000
>@@ -1,5 +1,5 @@
> /* 
>- * Copyright (C) 2000-2003 the xine project
>+ * Copyright (C) 2000-2005 the xine project
>  * 
>  * This file is part of xine, a unix video player.
>  * 
>@@ -28,6 +28,8 @@
> #include <windows.h>
> #include <ddraw.h>
> 
>+#include <pthread.h>
>+
> #include "xine.h"
> #include "video_out.h"
> #include "alphablend.h"
>@@ -54,7 +56,7 @@
>  * Defining them here allows us to get rid of the dxguid library during
>  * the linking stage.
>  *****************************************************************************/
>-#if 0
>+#if 1
> static const GUID IID_IDirectDraw = {
> 	0x6C14DB80,0xA733,0x11CE,{0xA5,0x21,0x00,0x20,0xAF,0x0B,0xE5,0x60}
> };
>@@ -66,7 +68,7 @@
> };
> #endif
> 
>-#if 1
>+#if 0
> static const GUID IID_IDirectDraw4 = {
> 	0x9C59509A,0x39BD,0x11D1,{0x8C,0x4A,0x00,0xC0,0x4F,0xD9,0x30,0xC5}
> };
>@@ -100,9 +102,9 @@
> 
>   xine_t                  *xine;
> 
>-  LPDIRECTDRAW4		   ddobj;	    /* direct draw object */
>-  LPDIRECTDRAWSURFACE4	   primary;	    /* primary dd surface */
>-  LPDIRECTDRAWSURFACE4 	   secondary;	    /* secondary dd surface  */
>+  LPDIRECTDRAW		   ddobj;	    /* direct draw object */
>+  LPDIRECTDRAWSURFACE	   primary;	    /* primary dd surface */
>+  LPDIRECTDRAWSURFACE 	   secondary;	    /* secondary dd surface  */
>   LPDIRECTDRAWCLIPPER	   ddclipper;	    /* dd clipper object */
>   uint8_t *		   contents;	    /* secondary contents */
>   win32_frame_t           *current;         /* current frame */
>@@ -137,7 +139,7 @@
> /* Display formatted error message in 
>  * popup message box.*/
> 
>-void Error( HWND hwnd, LPSTR szfmt, ... )
>+static void Error( HWND hwnd, LPSTR szfmt, ... )
> {
>   char tempbuff[ 256 ];
>   *tempbuff = 0;
>@@ -148,7 +150,7 @@
> /* Update our drivers current knowledge
>  * of our windows video out posistion */
> 
>-void UpdateRect( win32_visual_t * win32_visual )
>+static void UpdateRect( win32_visual_t * win32_visual )
> {
>   if( win32_visual->FullScreen )
>     {
>@@ -172,10 +174,10 @@
>  * window and will always have a pixel format 
>  * identical to the current display mode. */
> 
>-boolean CreatePrimary( win32_driver_t * win32_driver )
>+static boolean CreatePrimary( win32_driver_t * win32_driver )
> {
>   LPDIRECTDRAW			ddobj;
>-  DDSURFACEDESC2			ddsd;
>+  DDSURFACEDESC			ddsd;
>   HRESULT					result;
> 
>   /* create direct draw object */
>@@ -193,16 +195,16 @@
>   result = IDirectDraw_SetCooperativeLevel( ddobj, win32_driver->win32_visual->WndHnd, DDSCL_NORMAL );
>   if( result != DD_OK )
>     {
>-      Error( 0, "SetCooperativeLevel : error %i", result );
>+      Error( 0, "SetCooperativeLevel : error 0x%lx", result );
>       return 0;
>     }
> 
>   /* try to get new interface */
> 
>-  result = IDirectDraw_QueryInterface( ddobj, &IID_IDirectDraw4, (LPVOID *) &win32_driver->ddobj );
>+  result = IDirectDraw_QueryInterface( ddobj, &IID_IDirectDraw, (LPVOID *) &win32_driver->ddobj );
>   if( result != DD_OK )
>     {
>-      Error( 0, "ddobj->QueryInterface : DirectX 4 or higher required" );
>+      Error( 0, "ddobj->QueryInterface : DirectX required" );
>       return 0;
>     }
> 
>@@ -217,19 +219,19 @@
>   ddsd.dwFlags        = DDSD_CAPS;
>   ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
> 
>-  result = IDirectDraw4_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->primary, 0 );
>+  result = IDirectDraw_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->primary, 0 );
>   if( result != DD_OK )
>     {
>-      Error( 0, "CreateSurface ( primary ) : error %i ", result );
>+      Error( 0, "CreateSurface ( primary ) : error 0x%lx", result );
>       return 0;
>     }
> 
>   /* create our clipper object */
> 
>-  result = IDirectDraw4_CreateClipper( win32_driver->ddobj, 0, &win32_driver->ddclipper, 0 );
>+  result = IDirectDraw_CreateClipper( win32_driver->ddobj, 0, &win32_driver->ddclipper, 0 );
>   if( result != DD_OK )
>     {
>-      Error( 0, "CreateClipper : error %i", result );
>+      Error( 0, "CreateClipper : error 0x%lx", result );
>       return 0;
>     }
> 
>@@ -238,16 +240,16 @@
>   result = IDirectDrawClipper_SetHWnd( win32_driver->ddclipper, 0, win32_driver->win32_visual->WndHnd );
>   if( result != DD_OK )
>     {
>-      Error( 0, "ddclipper->SetHWnd : error %i", result );
>+      Error( 0, "ddclipper->SetHWnd : error 0x%lx", result );
>       return 0;
>     }
> 
>   /* associate our primary surface with our clipper */
> 
>-  result = IDirectDrawSurface4_SetClipper( win32_driver->primary, win32_driver->ddclipper );
>+  result = IDirectDrawSurface_SetClipper( win32_driver->primary, win32_driver->ddclipper );
>   if( result != DD_OK )
>     {
>-      Error( 0, "ddclipper->SetHWnd : error %i", result );
>+      Error( 0, "ddclipper->SetHWnd : error 0x%lx", result );
>       return 0;
>     }
> 
>@@ -268,9 +270,10 @@
>  * as the primary surface. At least then we
>  * can use h/w scaling if supported. */
> 
>-boolean CreateSecondary( win32_driver_t * win32_driver, int width, int height, int format )
>+static boolean CreateSecondary( win32_driver_t * win32_driver, int width, int height, int format )
> {
>-  DDSURFACEDESC2			ddsd;
>+  DDSURFACEDESC ddsd;
>+  HRESULT result;
> 
>   if( format == XINE_IMGFMT_YV12 )
>     xprintf(win32_driver->xine, XINE_VERBOSITY_DEBUG, "vo_out_directx : switching to YV12 overlay type\n" );
>@@ -297,7 +300,7 @@
>    * surface then release it */
> 
>   if( win32_driver->secondary )
>-    IDirectDrawSurface4_Release( win32_driver->secondary );
>+    IDirectDrawSurface_Release( win32_driver->secondary );
> 
>   memset( &ddsd, 0, sizeof( ddsd ) );
>   ddsd.dwSize         = sizeof( ddsd );
>@@ -356,47 +359,49 @@
>     } 
> #endif /* RGB_SUPPORT */
> 
>-  lprintf("CreateSecondary() - IDirectDraw4_CreateSurface()\n");
>-
>-  if( IDirectDraw4_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->secondary, 0 ) == DD_OK )
>+  lprintf("CreateSecondary() - IDirectDraw_CreateSurface()\n");
>+  if( IDirectDraw_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->secondary, 0 ) == DD_OK )
>     return TRUE;
> 
>   /*  Our fallback method is to create a back buffer
>    *  with the same image format as the primary surface */
> 
>   lprintf("CreateSecondary() - Falling back to back buffer same as primary\n");
>+  lprintf("CreateSecondary() - act_format = (NATIVE) %d\n", IMGFMT_NATIVE);
> 
>   ddsd.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
>   ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
>-
>-  lprintf("CreateSecondary() - act_format = (NATIVE) %d\n", IMGFMT_NATIVE);
>-
>   win32_driver->act_format = IMGFMT_NATIVE;
> 
>-  if( IDirectDraw4_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->secondary, 0 ) == DD_OK )
>+  if( IDirectDraw_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->secondary, 0 ) == DD_OK )
>+    return TRUE;
>+
>+  /*  Our second fallback - all w/o HW acceleration */
>+  lprintf("CreateSecondary() - Falling back, disabling HW acceleration \n");
>+  ddsd.dwFlags        = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
>+  ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
>+  if( (result = IDirectDraw_CreateSurface( win32_driver->ddobj, &ddsd, &win32_driver->secondary, 0 )) == DD_OK )
>     return TRUE;
> 
>   /* This is bad. We cant even create a surface with
>    * the same format as the primary surface. */
>-
>-  Error( 0, "CreateSurface ( Secondary ) : unable to create a suitable rendering surface" );
>-
>+  Error( 0, "CreateSurface ( Secondary ) : unable to create a suitable rendering surface: 0x%08lX", result );
>   return FALSE;
> }
> 
> /* Destroy all direct draw driver allocated
>  * resources. */
> 
>-void Destroy( win32_driver_t * win32_driver )
>+static void Destroy( win32_driver_t * win32_driver )
> {
>   if( win32_driver->ddclipper )
>     IDirectDrawClipper_Release( win32_driver->ddclipper );
> 
>   if( win32_driver->primary )
>-    IDirectDrawSurface4_Release( win32_driver->primary );
>+    IDirectDrawSurface_Release( win32_driver->primary );
> 
>   if( win32_driver->secondary )
>-    IDirectDrawSurface4_Release( win32_driver->secondary );
>+    IDirectDrawSurface_Release( win32_driver->secondary );
> 
>   if( win32_driver->ddobj )
>     IDirectDraw_Release( win32_driver->ddobj );
>@@ -411,7 +416,7 @@
>  * the h/w does not support an overlay for
>  * the native frame format. */
> 
>-boolean CheckPixelFormat( win32_driver_t * win32_driver )
>+static boolean CheckPixelFormat( win32_driver_t * win32_driver )
> {
>   DDPIXELFORMAT	ddpf;
>   HRESULT			result;
>@@ -420,10 +425,10 @@
> 
>   memset( &ddpf, 0, sizeof( DDPIXELFORMAT ));
>   ddpf.dwSize = sizeof( DDPIXELFORMAT );
>-  result = IDirectDrawSurface4_GetPixelFormat( win32_driver->primary, &ddpf );
>+  result = IDirectDrawSurface_GetPixelFormat( win32_driver->primary, &ddpf );
>   if( result != DD_OK )
>     {
>-      Error( 0, "IDirectDrawSurface4_GetPixelFormat ( CheckPixelFormat ) : error %u", result );
>+      Error( 0, "IDirectDrawSurface_GetPixelFormat ( CheckPixelFormat ) : error 0x%lx", result );
>       return 0;
>     }
> 
>@@ -486,10 +491,10 @@
>  * being pushed to the backend. */
> 
> 
>-LPDIRECTDRAWSURFACE4 CreateBMP( win32_driver_t * win32_driver, int resource )
>+static LPDIRECTDRAWSURFACE CreateBMP( win32_driver_t * win32_driver, int resource )
> {
>-  LPDIRECTDRAWSURFACE4	bmp_surf;
>-  DDSURFACEDESC2	bmp_ddsd;
>+  LPDIRECTDRAWSURFACE	bmp_surf;
>+  DDSURFACEDESC	bmp_ddsd;
>   HBITMAP		bmp_hndl;
>   BITMAP		bmp_head;
>   HDC			hdc_dds;
>@@ -515,7 +520,7 @@
>   bmp_ddsd.dwWidth        = bmp_head.bmWidth;
>   bmp_ddsd.dwHeight       = bmp_head.bmHeight;
> 
>-  if( IDirectDraw4_CreateSurface( win32_driver->ddobj, &bmp_ddsd, &bmp_surf, 0 ) != DD_OK )
>+  if( IDirectDraw_CreateSurface( win32_driver->ddobj, &bmp_ddsd, &bmp_surf, 0 ) != DD_OK )
>     {
>       Error( 0, "CreateSurface ( bitmap ) : could not create dd surface" );
>       return 0;
>@@ -525,7 +530,7 @@
>    * create a compat dc and load
>    * our bitmap into the compat dc */
> 
>-  IDirectDrawSurface4_GetDC( bmp_surf, &hdc_dds );
>+  IDirectDrawSurface_GetDC( bmp_surf, &hdc_dds );
>   hdc_mem = CreateCompatibleDC( hdc_dds );
>   SelectObject( hdc_mem, bmp_hndl );
> 
>@@ -539,7 +544,7 @@
> 
>   DeleteDC( hdc_mem );
>   DeleteObject( bmp_hndl );
>-  IDirectDrawSurface4_ReleaseDC( bmp_surf, hdc_dds );
>+  IDirectDrawSurface_ReleaseDC( bmp_surf, hdc_dds );
> 
>   return bmp_surf;
> }
>@@ -549,8 +554,8 @@
>  * a h/w overlay of the current frame type
>  * is supported. */
> 
>-boolean Overlay( LPDIRECTDRAWSURFACE4 src_surface, RECT * src_rect,
>-		 LPDIRECTDRAWSURFACE4 dst_surface, RECT * dst_rect,
>+static boolean Overlay( LPDIRECTDRAWSURFACE src_surface, RECT * src_rect,
>+		 LPDIRECTDRAWSURFACE dst_surface, RECT * dst_rect,
> 		 COLORREF color_key )
> {
>   DWORD			dw_color_key;
>@@ -564,10 +569,10 @@
> 
>   memset( &ddpf, 0, sizeof( DDPIXELFORMAT ));
>   ddpf.dwSize = sizeof( DDPIXELFORMAT );
>-  result = IDirectDrawSurface4_GetPixelFormat( dst_surface, &ddpf );
>+  result = IDirectDrawSurface_GetPixelFormat( dst_surface, &ddpf );
>   if( result != DD_OK )
>     {
>-      Error( 0, "IDirectDrawSurface4_GetPixelFormat : could not get surface pixel format" );
>+      Error( 0, "IDirectDrawSurface_GetPixelFormat : could not get surface pixel format" );
>       return FALSE;
>     }
> 
>@@ -585,19 +590,19 @@
> 
>   /* attempt to overlay the surface */
> 
>-  result = IDirectDrawSurface4_UpdateOverlay( src_surface, src_rect, dst_surface, dst_rect, flags, &ddofx );
>+  result = IDirectDrawSurface_UpdateOverlay( src_surface, src_rect, dst_surface, dst_rect, flags, &ddofx );
>   if( result != DD_OK )
>     {
>       if( result == DDERR_SURFACELOST )
> 	{
>-	  IDirectDrawSurface4_Restore( src_surface );
>-	  IDirectDrawSurface4_Restore( dst_surface );
>+	  IDirectDrawSurface_Restore( src_surface );
>+	  IDirectDrawSurface_Restore( dst_surface );
> 
>-	  IDirectDrawSurface4_UpdateOverlay( src_surface, src_rect, dst_surface, dst_rect, flags, &ddofx );
>+	  IDirectDrawSurface_UpdateOverlay( src_surface, src_rect, dst_surface, dst_rect, flags, &ddofx );
> 	}
>       else
> 	{
>-	  Error( 0, "IDirectDrawSurface4_UpdateOverlay : error %i", result );
>+	  Error( 0, "IDirectDrawSurface_UpdateOverlay : error 0x%lx", result );
> 	  return FALSE;
> 	}
>     }
>@@ -610,8 +615,8 @@
>  * h/w overlay of the current frame format is
>  * not supported. */
> 
>-boolean BltCopy( LPDIRECTDRAWSURFACE4 src_surface, RECT * src_rect,
>-		 LPDIRECTDRAWSURFACE4 dst_surface, RECT * dst_rect )
>+static boolean BltCopy( LPDIRECTDRAWSURFACE src_surface, RECT * src_rect,
>+		 LPDIRECTDRAWSURFACE dst_surface, RECT * dst_rect )
> {
>   DDSURFACEDESC	ddsd_target;
>   HRESULT	result;
>@@ -621,19 +626,19 @@
> 
>   /* attempt to blt the surface sontents */
> 
>-  result = IDirectDrawSurface4_Blt( dst_surface, dst_rect, src_surface, src_rect, DDBLT_WAIT, 0 );
>+  result = IDirectDrawSurface_Blt( dst_surface, dst_rect, src_surface, src_rect, DDBLT_WAIT, 0 );
>   if( result != DD_OK )
>     {
>       if( result != DDERR_SURFACELOST )
> 	{
>-	  IDirectDrawSurface4_Restore( src_surface );
>-	  IDirectDrawSurface4_Restore( dst_surface );
>+	  IDirectDrawSurface_Restore( src_surface );
>+	  IDirectDrawSurface_Restore( dst_surface );
> 
>-	  IDirectDrawSurface4_Blt( dst_surface, dst_rect, src_surface, src_rect, DDBLT_WAIT, 0 );
>+	  IDirectDrawSurface_Blt( dst_surface, dst_rect, src_surface, src_rect, DDBLT_WAIT, 0 );
> 	}
>       else
> 	{
>-	  Error( 0, "IDirectDrawSurface4_Blt : error %i", result );
>+	  Error( 0, "IDirectDrawSurface_Blt : error 0x%lx", result );
> 	  return FALSE;
> 	}
>     }
>@@ -647,7 +652,7 @@
>  * moving the image contents contained in our
>  * secondary surface to our primary surface. */
> 
>-boolean DisplayFrame( win32_driver_t * win32_driver )
>+static boolean DisplayFrame( win32_driver_t * win32_driver )
> {
>   int					view_width;
>   int					view_height;
>@@ -752,10 +757,10 @@
> 
> /* Lock our back buffer to update its contents. */
> 
>-void * Lock( void * surface )
>+static void * Lock( void * surface )
> {
>-  LPDIRECTDRAWSURFACE4	lock_surface = ( LPDIRECTDRAWSURFACE4 ) surface;
>-  DDSURFACEDESC2	ddsd;
>+  LPDIRECTDRAWSURFACE	lock_surface = ( LPDIRECTDRAWSURFACE ) surface;
>+  DDSURFACEDESC	ddsd;
>   HRESULT		result;
> 
>   if( !surface )
>@@ -764,11 +769,11 @@
>   memset( &ddsd, 0, sizeof( ddsd ) );
>   ddsd.dwSize = sizeof( ddsd );
> 
>-  result = IDirectDrawSurface4_Lock( lock_surface, 0, &ddsd, DDLOCK_WAIT | DDLOCK_NOSYSLOCK, 0 );
>+  result = IDirectDrawSurface_Lock( lock_surface, 0, &ddsd, DDLOCK_WAIT | DDLOCK_NOSYSLOCK, 0 );
>   if( result == DDERR_SURFACELOST )
>     {
>-      IDirectDrawSurface4_Restore( lock_surface );
>-      result = IDirectDrawSurface4_Lock( lock_surface, 0, &ddsd, DDLOCK_WAIT | DDLOCK_NOSYSLOCK, 0 );
>+      IDirectDrawSurface_Restore( lock_surface );
>+      result = IDirectDrawSurface_Lock( lock_surface, 0, &ddsd, DDLOCK_WAIT | DDLOCK_NOSYSLOCK, 0 );
> 
>       if( result != DD_OK )
> 	return 0;
>@@ -784,20 +789,18 @@
>     }
> 
>   return ddsd.lpSurface;
>-
>-  return 0;
> }
> 
> /* Unlock our back buffer to prepair for display. */
> 
>-void Unlock( void * surface )
>+static void Unlock( void * surface )
> {
>-  LPDIRECTDRAWSURFACE4 lock_surface = ( LPDIRECTDRAWSURFACE4 ) surface;
>+  LPDIRECTDRAWSURFACE lock_surface = ( LPDIRECTDRAWSURFACE ) surface;
> 
>   if( !surface )
>     return;
> 
>-  IDirectDrawSurface4_Unlock( lock_surface, 0 );
>+  IDirectDrawSurface_Unlock( lock_surface, 0 );
> }
> 
> /* -----------------------------------------
>@@ -867,6 +870,8 @@
>   if (!win32_frame)
>     return NULL;
> 
>+  pthread_mutex_init(&win32_frame->vo_frame.mutex, NULL);
>+
>   win32_frame->vo_frame.proc_slice = NULL;
>   win32_frame->vo_frame.proc_frame = NULL;
>   win32_frame->vo_frame.field      = win32_frame_field;
>@@ -885,6 +890,7 @@
> 
>   /*printf("vo_out_directx : win32_update_frame_format() - width = %d, height=%d, ratio_code=%d, format=%d, flags=%d\n", width, height, ratio_code, format, flags);*/
> 
>+
>   if( ( win32_frame->format	!= format	) ||
>       ( win32_frame->width	!= width	) ||
>       ( win32_frame->height	!= height	) )
>@@ -936,6 +942,7 @@
>       win32_frame->height	= height;
>       win32_frame->ratio	= ratio;
>     }
>+
> }
> 
> static void win32_display_frame( vo_driver_t * vo_driver, vo_frame_t * vo_frame )
>@@ -945,6 +952,7 @@
>   int              offset;
>   int              size;
> 
>+
>   /* if the required width, height or format has changed
>    * then recreate the secondary buffer */
> 
>@@ -1091,6 +1099,7 @@
>     vo_frame->free(&win32_driver->current->vo_frame);
>   }
>   win32_driver->current = (win32_frame_t *)vo_frame;
>+
> }
> 
> static void win32_overlay_blend( vo_driver_t * vo_driver, vo_frame_t * vo_frame, vo_overlay_t * vo_overlay )
>@@ -1098,6 +1107,7 @@
>   win32_frame_t * win32_frame = ( win32_frame_t * ) vo_frame;
>   win32_driver_t * win32_driver = ( win32_driver_t * ) vo_driver;
> 
>+
>   /* temporary overlay support, somthing more appropriate
>    * for win32 will be devised at a later date */
> 
>@@ -1176,6 +1186,7 @@
>   directx_class_t *class = (directx_class_t *)class_gen;
>   win32_driver_t  *win32_driver = ( win32_driver_t * ) xine_xmalloc ( sizeof( win32_driver_t ) );
> 
>+
>   _x_alphablend_init(&win32_driver->alphablend_extra_data, class->xine);
>   
>   win32_driver->xine = class->xine;
>@@ -1196,12 +1207,15 @@
>   win32_driver->vo_driver.dispose		= win32_exit;
>   win32_driver->vo_driver.redraw_needed         = win32_redraw_needed;
> 
>-  CreatePrimary( win32_driver );
>+  if (!CreatePrimary( win32_driver )) {
>+      Destroy( win32_driver );
>+      return NULL;
>+  }
>   if( !CheckPixelFormat( win32_driver ) )
>     {
>       Error( 0, "vo_directx : Your screen pixel format is not supported" );
>       Destroy( win32_driver );
>-      return 0;
>+      return NULL;
>     }
> 
> #if (NEW_YUV)
>@@ -1212,7 +1226,7 @@
> #endif
> 
>   return ( vo_driver_t * ) win32_driver;
>-}    
>+}
> 
> 
> static char* get_identifier (video_driver_class_t *this_gen) {
>@@ -1232,7 +1246,7 @@
> static void *init_class (xine_t *xine, void *visual_gen) {
> 
>   directx_class_t    *directx;
>-  
>+
>   /*
>    * from this point on, nothing should go wrong anymore
>    */
>Index: src/video_out/video_out_xv.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_xv.c,v
>retrieving revision 1.209.2.1
>diff -u -r1.209.2.1 video_out_xv.c
>--- src/video_out/video_out_xv.c	20 Apr 2005 17:21:13 -0000	1.209.2.1
>+++ src/video_out/video_out_xv.c	8 Oct 2005 14:29:25 -0000
>@@ -44,12 +44,6 @@
> #include <errno.h>
> #include <math.h>
> 
>-#if defined (__SVR4) && defined (__sun)
>-# include <sys/int_types.h>
>-#else
>-# include <stdint.h>
>-#endif
>-
> #include <sys/types.h>
> #if defined(__FreeBSD__)
> #include <machine/param.h>
>Index: src/xine-engine/Makefile.am
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/Makefile.am,v
>retrieving revision 1.103.2.1
>diff -u -r1.103.2.1 Makefile.am
>--- src/xine-engine/Makefile.am	3 Jan 2005 21:14:01 -0000	1.103.2.1
>+++ src/xine-engine/Makefile.am	8 Oct 2005 14:29:26 -0000
>@@ -1,22 +1,15 @@
> include $(top_srcdir)/misc/Makefile.common
> include $(top_srcdir)/lib/Makefile.common
> 
>-AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)
>+AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS)
>+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
> 
> LIBTOOL = $(SHELL) $(top_builddir)/libtool
> lib_LTLIBRARIES = libxine.la
> 
> XINEUTILS_LIB  = $(top_builddir)/src/xine-utils/libxineutils.la
>-INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
>-DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la
>-INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la
> DEF_FILE = libxine-$(XINE_MAJOR).def
>-if !HAVE_ZLIB
>-zlib_dep = $(INTERNAL_ZLIB_LIB)
>-endif
> if WIN32
>-dirent_lib = $(DIRENT_LIB)
>-pthread_dep = $(INTERNAL_PTHREAD_LIB)
> def_ldflags="-Wl,--output-def,$(DEF_FILE)"
> endif
> 
>@@ -33,11 +26,11 @@
> if INCLUDED_INTL
> INCLUDED_INTLLIBS = @INTLLIBS@
> endif
>-libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) $(zlib_dep) \
>-                          $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX)
>+libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) \
>+                          $(pthread_dep) $(LIBXINEPOSIX)
> libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \
> 		    -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \
>-                    $(dirent_lib) $(LIBXINEPOSIX) $(RT_LIBS)
>+                    $(LIBXINEPOSIX) $(RT_LIBS)
> 
> libxine_la_LDFLAGS =  \
> 	-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \
>@@ -57,7 +50,7 @@
> 	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
> 
> uninstall-local:
>-	rm -f $(DEF_FILE) $(DESTDIR)$(libdir)
>+	rm -f $(DEF_FILE)
> endif
> 
> @INCLUDED_INTL_TRUE@@INTLLIBS@:
>@@ -65,12 +58,3 @@
> 
> $(XINEUTILS_LIB):
> 	$(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la
>-
>-$(INTERNAL_PTHREAD_LIB):
>-	$(MAKE) -C $(top_builddir)/win32/contrib/pthreads libpthread.la
>-
>-$(INTERNAL_ZLIB_LIB):
>-	$(MAKE) -C $(top_builddir)/win32/contrib/zlib libzlib.la
>-
>-$(DIRENT_LIB):
>-	$(MAKE) -C $(top_builddir)/win32/contrib libdirent.la
>Index: src/xine-engine/audio_decoder.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/audio_decoder.c,v
>retrieving revision 1.133.2.1
>diff -u -r1.133.2.1 audio_decoder.c
>--- src/xine-engine/audio_decoder.c	20 Apr 2005 17:21:14 -0000	1.133.2.1
>+++ src/xine-engine/audio_decoder.c	8 Oct 2005 14:29:27 -0000
>@@ -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.
>  * 
>@@ -148,7 +148,7 @@
> 
>       pthread_cond_broadcast (&stream->counter_changed);
> 
>-      if (stream->video_thread) {
>+      if (stream->video_thread_created) {
>         while (stream->finished_count_video < stream->finished_count_audio) {
>           struct timeval tv;
>           struct timespec ts;
>@@ -490,7 +490,8 @@
>     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
>     pthread_attr_setschedparam(&pth_attrs, &pth_params);
>     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
>-  
>+ 
>+    stream->audio_thread_created = 1; 
>     if ((err = pthread_create (&stream->audio_thread,
>                                &pth_attrs, audio_decoder_loop, stream)) != 0) {
>       xprintf (stream->xine, XINE_VERBOSITY_DEBUG, 
>@@ -507,14 +508,15 @@
>   buf_element_t *buf;
>   void          *p;
> 
>-  if (stream->audio_thread) {
>+  if (stream->audio_thread_created) {
>     /* stream->audio_fifo->clear(stream->audio_fifo); */
> 
>     buf = stream->audio_fifo->buffer_pool_alloc (stream->audio_fifo);
>     buf->type = BUF_CONTROL_QUIT;
>     stream->audio_fifo->put (stream->audio_fifo, buf);
>     
>-    pthread_join (stream->audio_thread, &p); 
>+    pthread_join (stream->audio_thread, &p);
>+    stream->audio_thread_created = 0;
>   }
>     
>   stream->audio_fifo->dispose (stream->audio_fifo);
>Index: src/xine-engine/audio_out.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/audio_out.c,v
>retrieving revision 1.189.2.1
>diff -u -r1.189.2.1 audio_out.c
>--- src/xine-engine/audio_out.c	9 Feb 2005 19:39:44 -0000	1.189.2.1
>+++ src/xine-engine/audio_out.c	8 Oct 2005 14:29:31 -0000
>@@ -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.
>  * 
>@@ -216,6 +216,7 @@
>   int             audio_loop_running;
>   int             grab_only; /* => do not start thread, frontend will consume samples */
>   pthread_t       audio_thread;
>+  int             audio_thread_created;
> 
>   int64_t         audio_step;           /* pts per 32 768 samples (sample = #bytes/2) */
>   int32_t         frames_per_kpts;      /* frames per 1024/90000 sec                  */
>@@ -1543,7 +1544,7 @@
>     fifo_append (this->out_fifo, buf);
> 
>     pthread_join (this->audio_thread, &p);
>-    this->audio_thread = 0;
>+    this->audio_thread_created = 0;
>   }
>       
>   if (!this->grab_only) {
>@@ -2103,7 +2104,8 @@
>     
>     pthread_attr_init(&pth_attrs);
>     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
>-    
>+
>+    this->audio_thread_created = 1;
>     if ((err = pthread_create (&this->audio_thread,
> 			       &pth_attrs, ao_loop, this)) != 0) {
>       
>Index: src/xine-engine/buffer_types.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/buffer_types.c,v
>retrieving revision 1.89.2.4
>diff -u -r1.89.2.4 buffer_types.c
>--- src/xine-engine/buffer_types.c	17 Jul 2005 21:50:14 -0000	1.89.2.4
>+++ src/xine-engine/buffer_types.c	8 Oct 2005 14:29:32 -0000
>@@ -284,7 +284,8 @@
>     else if (!strncasecmp (video, "yuv2", 4))
>     this->video_type = BUF_VIDEO_YUY2;
>     */
>-    meFOURCC('y','u','v','2'),
>+    meFOURCC('y', 'u', 'v', '2'),
>+    meFOURCC('Y', 'U', 'Y', '2'),
>     0
>   },
>   BUF_VIDEO_YUY2,
>Index: src/xine-engine/configfile.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/configfile.c,v
>retrieving revision 1.73.2.3
>diff -u -r1.73.2.3 configfile.c
>--- src/xine-engine/configfile.c	21 Jul 2005 02:57:52 -0000	1.73.2.3
>+++ src/xine-engine/configfile.c	8 Oct 2005 14:29:34 -0000
>@@ -964,7 +964,7 @@
>     f_backup = fopen(temp, "w");
>     f_config = fopen(filename, "r");
>     
>-    if (f_config && f_backup && (stat(filename, &config_stat) == 0) && (config_stat.st_size > 0)) {
>+    if (f_config && f_backup && (stat(filename, &config_stat) == 0)) {
>       char    *buf = NULL;
>       size_t   rlen;
>       
>Index: src/xine-engine/demux.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/demux.c,v
>retrieving revision 1.54.2.1
>diff -u -r1.54.2.1 demux.c
>--- src/xine-engine/demux.c	20 Apr 2005 17:21:15 -0000	1.54.2.1
>+++ src/xine-engine/demux.c	8 Oct 2005 14:29:35 -0000
>@@ -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.
>  *
>@@ -150,13 +150,13 @@
> 
>   pthread_mutex_lock (&stream->counter_lock);
> 
>-  if (stream->video_thread) {
>+  if (stream->video_thread_created) {
>     header_count_video = stream->header_count_video + 1;
>   } else {
>     header_count_video = 0;
>   }
> 
>-  if (stream->audio_thread) {
>+  if (stream->audio_thread_created) {
>     header_count_audio = stream->header_count_audio + 1;
>   } else {
>     header_count_audio = 0;
>@@ -292,9 +292,9 @@
>   lprintf ("loop finished (status: %d)\n", status);
> 
>   pthread_mutex_lock (&stream->counter_lock);
>-  if (stream->audio_thread)
>+  if (stream->audio_thread_created)
>     finished_count_audio = stream->finished_count_audio + 1;
>-  if (stream->video_thread)
>+  if (stream->video_thread_created)
>     finished_count_video = stream->finished_count_video + 1;
>   pthread_mutex_unlock (&stream->counter_lock);
> 
>@@ -332,12 +332,13 @@
>   
>   if( !stream->demux_thread_running ) {
> 
>-    if (stream->demux_thread) {
>+    if (stream->demux_thread_created) {
>       void *p;
>       pthread_join(stream->demux_thread, &p);
>     }
> 
>     stream->demux_thread_running = 1;
>+    stream->demux_thread_created = 1;
>     if ((err = pthread_create (&stream->demux_thread,
> 			       NULL, demux_loop, (void *)stream)) != 0) {
>       printf ("demux: can't create new thread (%s)\n", strerror(err));
>@@ -368,9 +369,9 @@
> 
>   lprintf ("joining thread %ld\n", stream->demux_thread );
>   
>-  if( stream->demux_thread ) {
>+  if( stream->demux_thread_created ) {
>     pthread_join (stream->demux_thread, &p);
>-    stream->demux_thread = 0;
>+    stream->demux_thread_created = 0;
>   }
>   
>   /*
>Index: src/xine-engine/events.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/events.c,v
>retrieving revision 1.26.2.1
>diff -u -r1.26.2.1 events.c
>--- src/xine-engine/events.c	17 Jul 2005 21:50:14 -0000	1.26.2.1
>+++ src/xine-engine/events.c	8 Oct 2005 14:29:36 -0000
>@@ -183,6 +183,10 @@
>     xine_event_free (event);
>   }
> 
>+  pthread_mutex_destroy(&queue->lock);
>+  pthread_cond_destroy(&queue->new_event);
>+  pthread_cond_destroy(&queue->events_processed);
>+
>   free (queue);
> }
> 
>Index: src/xine-engine/load_plugins.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/load_plugins.c,v
>retrieving revision 1.193.2.5
>diff -u -r1.193.2.5 load_plugins.c
>--- src/xine-engine/load_plugins.c	18 Jul 2005 01:46:40 -0000	1.193.2.5
>+++ src/xine-engine/load_plugins.c	8 Oct 2005 14:29:40 -0000
>@@ -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.
>  *
>@@ -32,7 +32,9 @@
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
>+#ifdef HAVE_DIRENT_H
> #include <dirent.h>
>+#endif
> #include <dlfcn.h>
> #include <string.h>
> #include <errno.h>
>@@ -536,19 +538,20 @@
>     str[path_len + 1] = '\0';
> 
>     while ((pEntry = readdir (dir)) != NULL) {
>-      size_t new_str_size;
>+      size_t new_str_size, d_len;
>       void *lib = NULL;
>       plugin_info_t *info = NULL;
>       
>       struct stat statbuffer;
> 
>-      new_str_size = path_len + pEntry->d_reclen + 2;
>+      d_len = strlen(pEntry->d_name);
>+      new_str_size = path_len + d_len + 2;
>       if (str_size < new_str_size) {
> 	str_size = new_str_size + new_str_size / 2;
> 	str = realloc(str, str_size);
>       }
> 
>-      xine_fast_memcpy(&str[path_len + 1], pEntry->d_name, pEntry->d_reclen + 1);
>+      xine_fast_memcpy(&str[path_len + 1], pEntry->d_name, d_len + 1);
> 
>       if (stat(str, &statbuffer)) {
> 	xine_log (this, XINE_LOG_PLUGIN, _("load_plugins: unable to stat %s\n"), str);
>@@ -1085,21 +1088,21 @@
>   if ((pluginpath = getenv("XINE_PLUGIN_PATH")) != NULL) {
>     pluginpath = strdup(pluginpath);
>   } else {
>-    char *str1, *str2;
>+    const char *str1, *str2;
>     int len;
> 
>     str1 = "~/.xine/plugins";
>     str2 = XINE_PLUGINDIR;
>     len = strlen(str1) + strlen(str2) + 2;
>     pluginpath = xine_xmalloc(len);
>-    snprintf(pluginpath, len, "%s:%s", str1, str2);
>+    snprintf(pluginpath, len, "%s" XINE_DIRECTORY_SEPARATOR_STRING "%s", str1, str2);
>   }
>   plugindir = xine_xmalloc(strlen(pluginpath)+strlen(homedir)+2);
>   j=0;
>   lenpluginpath = strlen(pluginpath);
>   for (i=0; i <= lenpluginpath; ++i){
>     switch (pluginpath[i]){
>-    case ':':
>+    case XINE_DIRECTORY_SEPARATOR_CHAR:
>     case '\0':
>       plugindir[j] = '\0';
>       collect_plugins(this, plugindir);
>@@ -2492,7 +2495,9 @@
> 
>     for (i = 0; this->plugin_catalog->prio_desc[i]; i++)
>       free(this->plugin_catalog->prio_desc[i]);
>-    
>+
>+    pthread_mutex_destroy(&this->plugin_catalog->lock);
>+
>     free (this->plugin_catalog);
>   }
> }
>Index: src/xine-engine/metronom.h
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/metronom.h,v
>retrieving revision 1.62
>diff -u -r1.62 metronom.h
>--- src/xine-engine/metronom.h	26 Sep 2004 22:54:52 -0000	1.62
>+++ src/xine-engine/metronom.h	8 Oct 2005 14:29:40 -0000
>@@ -202,7 +202,6 @@
>   int             discontinuity_handled_count;
>   pthread_cond_t  video_discontinuity_reached;
>   pthread_cond_t  audio_discontinuity_reached;
>-  pthread_cond_t  cancel;
> 
>   int             force_video_jump;
>   int             force_audio_jump;
>Index: src/xine-engine/osd.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/osd.c,v
>retrieving revision 1.67.2.2
>diff -u -r1.67.2.2 osd.c
>--- src/xine-engine/osd.c	20 Apr 2005 17:21:16 -0000	1.67.2.2
>+++ src/xine-engine/osd.c	8 Oct 2005 14:29:43 -0000
>@@ -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.
>  * 
>@@ -31,7 +31,9 @@
> #include <stdio.h>
> #include <zlib.h>
> #include <sys/types.h>
>+#ifdef HAVE_DIRENT_H
> #include <dirent.h>
>+#endif
> #include <errno.h>
> 
> #ifdef HAVE_ICONV
>Index: src/xine-engine/video_decoder.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/video_decoder.c,v
>retrieving revision 1.155.2.1
>diff -u -r1.155.2.1 video_decoder.c
>--- src/xine-engine/video_decoder.c	20 Apr 2005 17:21:16 -0000	1.155.2.1
>+++ src/xine-engine/video_decoder.c	8 Oct 2005 14:29:44 -0000
>@@ -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.
>  * 
>@@ -220,7 +220,7 @@
> 
>       pthread_cond_broadcast (&stream->counter_changed);
> 
>-      if (stream->audio_thread) {
>+      if (stream->audio_thread_created) {
> 
>         while (stream->finished_count_video > stream->finished_count_audio) {
>           struct timeval tv;
>@@ -500,7 +500,8 @@
>     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
>     pthread_attr_setschedparam(&pth_attrs, &pth_params);
>     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
>-    
>+
>+    stream->video_thread_created = 1;
>     if ((err = pthread_create (&stream->video_thread,
>                                &pth_attrs, video_decoder_loop, stream)) != 0) {
>       fprintf (stderr, "video_decoder: can't create new thread (%s)\n",
>@@ -519,7 +520,7 @@
> 
>   lprintf ("shutdown...\n");
> 
>-  if (stream->video_thread) {
>+  if (stream->video_thread_created) {
> 
>     /* stream->video_fifo->clear(stream->video_fifo); */
> 
>@@ -533,6 +534,7 @@
>     lprintf ("shutdown...3\n");
> 
>     pthread_join (stream->video_thread, &p);
>+    stream->video_thread_created = 0;
> 
>     lprintf ("shutdown...4\n");
> 
>Index: src/xine-engine/xine.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine.c,v
>retrieving revision 1.306.2.4
>diff -u -r1.306.2.4 xine.c
>--- src/xine-engine/xine.c	21 Jul 2005 02:57:52 -0000	1.306.2.4
>+++ src/xine-engine/xine.c	8 Oct 2005 14:29:47 -0000
>@@ -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.
>  * 
>@@ -232,6 +232,7 @@
>   pthread_mutex_init(&port_ticket->lock, NULL);
>   pthread_mutex_init(&port_ticket->revoke_lock, NULL);
>   pthread_cond_init(&port_ticket->issued, NULL);
>+  pthread_cond_init(&port_ticket->revoked, NULL);
>   
>   return port_ticket;
> }
>@@ -288,7 +289,7 @@
>   /*
>    * 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");
>@@ -1341,7 +1342,7 @@
> #if defined(WIN32)
>   WSACleanup();
> #endif
>-  
>+
>   free (this);
> }
> 
>@@ -1352,7 +1353,7 @@
> #ifdef WIN32
>     WSADATA Data;
>     int i_err;
>-#endif /*  WIN32 */
>+#endif
> 
>   this = xine_xmalloc (sizeof (xine_t));
>   if (!this)
>Index: src/xine-engine/xine_internal.h
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine_internal.h,v
>retrieving revision 1.163.2.2
>diff -u -r1.163.2.2 xine_internal.h
>--- src/xine-engine/xine_internal.h	17 Jul 2005 21:50:14 -0000	1.163.2.2
>+++ src/xine-engine/xine_internal.h	8 Oct 2005 14:29:48 -0000
>@@ -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.
>  * 
>@@ -248,12 +248,14 @@
> 
> /*  vo_driver_t               *video_driver;*/
>   pthread_t                  video_thread;
>+  int                        video_thread_created;
>   video_decoder_t           *video_decoder_plugin;
>   int                        video_decoder_streamtype;
>   extra_info_t              *video_decoder_extra_info;
>   int                        video_channel;
>   
>   pthread_t                  audio_thread;
>+  int                        audio_thread_created;
>   audio_decoder_t           *audio_decoder_plugin;
>   int                        audio_decoder_streamtype;
>   extra_info_t              *audio_decoder_extra_info;
>@@ -308,6 +310,7 @@
>   
>   /* demux thread stuff */
>   pthread_t                  demux_thread;
>+  int                        demux_thread_created;
>   int                        demux_thread_running;
>   pthread_mutex_t            demux_lock;
>   int                        demux_action_pending;
>Index: src/xine-utils/utils.c
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-utils/utils.c,v
>retrieving revision 1.37.2.1
>diff -u -r1.37.2.1 utils.c
>--- src/xine-utils/utils.c	20 Apr 2005 17:21:17 -0000	1.37.2.1
>+++ src/xine-utils/utils.c	8 Oct 2005 14:29:50 -0000
>@@ -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.
>  * 
>@@ -55,6 +55,7 @@
> #endif
> 
> #if defined(__CYGWIN__) || defined(WIN32)
>+#include <ctype.h>
> #include <windows.h>
> #endif
> 
>@@ -267,90 +268,52 @@
>   return ptr;
> }
> 
>-#if defined(__CYGWIN__) || defined(WIN32)
>-
>-/* Ridiculous hack to return valid xine support
>- * directories. These should be read from
>- * a registry entry set at install time.
>+#ifdef WIN32
>+/*
>+ * Parse command line with Windows XP syntax and copy the command (argv[0]).
>  */
>+static size_t xine_strcpy_command(const char *cmdline, char *cmd, size_t maxlen) {
>+  size_t i, j;
> 
>-char *exec_path_append_subdir(char *string) {
>-  static char tmp_win32_path[1024] = "\0";
>-  char *back_slash;
>-  char *fore_slash;
>-  char *last_slash;
>-
>-  /* first run - fill out dll path */
>-  if (!*tmp_win32_path) {
>-    char *tmpchar;
>-    char *cmdline;
>-
>-    /* get program exec command line */
>-    cmdline = GetCommandLine();
>-
>-    /* check for " at beginning of string */
>-    if( *cmdline == '\"' ) {
>-      /* copy command line, skip first quote */
>-      strncpy(tmp_win32_path, cmdline + 1, sizeof(tmp_win32_path));
>-      tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0';
>-
>-      /* terminate at second set of quotes */
>-      tmpchar = strchr(tmp_win32_path, '\"');
>-      if (tmpchar) *tmpchar = 0;
>-    } else {
>-      /* copy command line */
>-      strncpy(tmp_win32_path, cmdline, sizeof(tmp_win32_path));
>-      tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0';
>-
>-      /* terminate at first space */
>-      tmpchar = strchr(tmp_win32_path, ' ');
>-      if (tmpchar) *tmpchar = 0;
>-    }
>-  }
>-
>-  /* find the last occurance of a back
>-   * slash or fore slash 
>-   */
>-  back_slash = strrchr(tmp_win32_path, '\\');
>-  fore_slash = strrchr(tmp_win32_path, '/');
>+  i = 0;
>+  j = 0;
>+  while (cmdline[i] && isspace(cmdline[i])) i++;
>+
>+  while (cmdline[i] && !isspace(cmdline[i]) && j + 2 < maxlen) {
>+    switch (cmdline[i]) {
>+    case '\"':
>+      i++;
>+      while (cmdline[i] && cmdline[i] != '\"') {
>+        if (cmdline[i] == '\\') {
>+          i++;
>+          if (cmdline[i] == '\"') cmd[j++] = '\"';
>+          else {
>+            cmd[j++] = '\\';
>+            cmd[j++] = cmdline[i];
>+          }
>+        } else cmd[j++] = cmdline[i];
>+        if (cmdline[i]) i++;
>+      }
>+      break;
> 
>-  /* make sure the last back slash was not
>-   * after a drive letter 
>-   */
>-  if(back_slash > tmp_win32_path)
>-    if(*( back_slash - 1 ) == ':')
>-      back_slash = 0;
>-
>-  /* which slash was the latter slash */
>-  if(back_slash > fore_slash)
>-    last_slash = back_slash;
>-  else
>-    last_slash = fore_slash;
>+    case '\\':
>+      i++;
>+      if (cmdline[i] == '\"') cmd[j++] = '\"';
>+      else {
>+        cmd[j++] = '\\';
>+        i--;
>+      }
>+      break;
> 
>-  /* detect if we had a relative or
>-   * distiguished path ( had a slash )
>-   */
>-  if(last_slash) {
>-    /* we had a slash charachter in our
>-     * command line
>-     */
>-    *(last_slash + 1) = 0;
>-
>-    /* if had a string to append to the path */
>-    if(string)
>-      strncat(tmp_win32_path, string, sizeof(tmp_win32_path) - strlen(tmp_win32_path) - 1);
>-  } else {
>-    if(string) {
>-    /* if had a string to append to the path */
>-      strncpy(tmp_win32_path, string, sizeof(tmp_win32_path));
>-      tmp_win32_path[sizeof(tmp_win32_path) - 1] = '\0';
>-    } else {
>-    /* no slash, assume local directory */
>-      strcpy(tmp_win32_path, ".");
>+    default:
>+      cmd[j++] = cmdline[i];
>     }
>+
>+    i++;
>   }
>+  cmd[j] = '\0';
> 
>-  return tmp_win32_path;
>+  return j;
> }
> #endif
> 
>@@ -359,11 +322,21 @@
> #endif
> 
> const char *xine_get_homedir(void) {
>-
> #ifdef WIN32
>-  return exec_path_append_subdir(NULL);
>-#else
>+  static char homedir[1024] = {0, };
>+  char *s;
>+  int len;
>+
>+  if (!homedir[0]) {
>+    len = xine_strcpy_command(GetCommandLine(), homedir, sizeof(homedir));
>+    s = strdup(homedir);
>+    GetFullPathName(s, sizeof(homedir), homedir, NULL);
>+    free(s);
>+    if ((s = strrchr(homedir, '\\'))) *s = '\0';
>+  }
> 
>+  return homedir;
>+#else
>   struct passwd pwd, *pw = NULL;
>   static char homedir[BUFSIZ] = {0,};
> 
>@@ -393,9 +366,52 @@
>   }
> 
>   return homedir;
>-#endif /* _MSC_VER */
>+#endif /* WIN32 */
>+}
>+
>+#if defined(WIN32) || defined(__CYGWIN__)
>+static void xine_get_rootdir(char *rootdir, size_t maxlen) {
>+  char *s;
>+
>+  strncpy(rootdir, xine_get_homedir(), maxlen - 1);
>+  rootdir[maxlen - 1] = '\0';
>+  if ((s = strrchr(rootdir, XINE_SUBDIRECTORY_SEPARATOR_CHAR))) *s = '\0';
> }
> 
>+const char *xine_get_plugindir(void) {
>+  static char plugindir[1024] = {0, };
>+
>+  if (!plugindir[0]) {
>+    xine_get_rootdir(plugindir, sizeof(plugindir) - strlen(XINE_REL_PLUGINDIR) - 1);
>+    strcat(plugindir, XINE_SUBDIRECTORY_SEPARATOR_STRING XINE_REL_PLUGINDIR);
>+  }
>+
>+  return plugindir;
>+}
>+
>+const char *xine_get_fontdir(void) {
>+  static char fontdir[1024] = {0, };
>+
>+  if (!fontdir[0]) {
>+    xine_get_rootdir(fontdir, sizeof(fontdir) - strlen(XINE_REL_FONTDIR) - 1);
>+    strcat(fontdir, XINE_SUBDIRECTORY_SEPARATOR_STRING XINE_REL_FONTDIR);
>+  }
>+
>+  return fontdir;
>+}
>+
>+const char *xine_get_localedir(void) {
>+  static char localedir[1024] = {0, };
>+
>+  if (!localedir[0]) {
>+    xine_get_rootdir(localedir, sizeof(localedir) - strlen(XINE_REL_LOCALEDIR) - 1);
>+    strcat(localedir, XINE_SUBDIRECTORY_SEPARATOR_STRING XINE_REL_LOCALEDIR);
>+  }
>+
>+  return localedir;
>+}
>+#endif
>+
> char *xine_chomp(char *str) {
>   char *pbuf;
> 
>Index: src/xine-utils/xineutils.h
>===================================================================
>RCS file: /cvsroot/xine/xine-lib/src/xine-utils/xineutils.h,v
>retrieving revision 1.96
>diff -u -r1.96 xineutils.h
>--- src/xine-utils/xineutils.h	12 Dec 2004 13:51:30 -0000	1.96
>+++ src/xine-utils/xineutils.h	8 Oct 2005 14:29:52 -0000
>@@ -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.
>  *
>@@ -59,6 +59,10 @@
> 
> #include <stdio.h>
> #include <string.h>
>+/* for alloca under MinGW */
>+#ifdef HAVE_MALLOC_H
>+#include <malloc.h>
>+#endif
> 
>   /*
>    * debugable mutexes
>@@ -638,6 +642,15 @@
>  */
> const char *xine_get_homedir(void);
> 
>+#if defined(WIN32) || defined(__CYGWIN__)
>+/*
>+ * Get other xine directories.
>+ */
>+const char *xine_get_plugindir(void);
>+const char *xine_get_fontdir(void);
>+const char *xine_get_localedir(void);
>+#endif
>+
> /*
>  * Clean a string (remove spaces and '=' at the begin,
>  * and '\n', '\r' and spaces at the end.
>@@ -1031,10 +1044,6 @@
>  */
> const char *xine_guess_spu_encoding(void);
> 
>-#if defined(__CYGWIN__) || defined(WIN32)
>-char *exec_path_append_subdir(char * string);
>-#endif
>-
> /*
>  * use the best clock reference (API compatible with gettimeofday)
>  * note: it will be a monotonic clock, if available.

Actions: View | Diff

Attachments on bug 120088: 51396 | 52066