[Mplayer-cvslog] CVS: main cfg-common.h,1.119,1.120 cfg-mencoder.h,1.72,1.73 configure,1.807,1.808

[Ivan Kalvachev CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv24512

Modified Files:
	cfg-common.h cfg-mencoder.h configure 
Log Message:
XviD Api4 support

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- cfg-common.h	27 Oct 2003 00:23:04 -0000	1.119
+++ cfg-common.h	12 Nov 2003 00:43:03 -0000	1.120
@@ -200,7 +200,7 @@
 #ifdef USE_LIBAVCODEC
 	{"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
-#ifdef HAVE_XVID
+#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
 	{"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 // ------------------------- subtitles options --------------------
@@ -437,7 +437,7 @@
 extern m_option_t lavc_decode_opts_conf[];
 #endif
 
-#ifdef HAVE_XVID
+#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
 extern m_option_t xvid_dec_opts[];
 #endif
 

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- cfg-mencoder.h	3 Nov 2003 16:35:17 -0000	1.72
+++ cfg-mencoder.h	12 Nov 2003 00:43:03 -0000	1.73
@@ -52,7 +52,7 @@
 extern m_option_t vfwopts_conf[];
 #endif
 
-#ifdef HAVE_XVID
+#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
 extern m_option_t xvidencopts_conf[];
 #endif
 
@@ -93,7 +93,7 @@
 #ifdef HAVE_LIBDV095
 	"   libdv    - DV encoding using libdv v0.9.5\n"
 #endif
-#ifdef HAVE_XVID
+#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
 	"   xvid     - xvid encoding\n"
 #endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
@@ -216,7 +216,7 @@
 #ifdef USE_WIN32DLL
 	{"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
-#ifdef HAVE_XVID
+#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
 	{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- configure	7 Nov 2003 22:14:51 -0000	1.807
+++ configure	12 Nov 2003 00:43:03 -0000	1.808
@@ -1076,6 +1076,7 @@
 
 _prefix="/usr/local"
 _xvmclib="XvMCNVIDIA"
+_xvidcore="xvidcore"
 
 # GOTCHA: the variables below defines the default behavior for autodetection
 # and have - unless stated otherwise - at least 2 states : yes no
@@ -4932,21 +4933,30 @@
 #include <xvid.h>
 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
 EOF
-if test "$_xvid" != no && cc_check "$_xvidcore" -lm ; then
+if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then
   _xvid=yes
-  _ld_xvid="$_xvidcore"
-  _def_xvid='#define HAVE_XVID 1'
+  _ld_xvid="-l$_xvidcore"
+  _def_xvid3='#define HAVE_XVID3 1'
+  _def_xvid4='#undef HAVE_XVID4'
   _codecmodules="xvid $_codecmodules"
-elif test "$_xvid" != no && cc_check -lxvidcore -lm ; then
+else
+cat > $TMPC << EOF
+#include <xvid.h>
+int main(void) { xvid_global(0, 0, 0, 0); return 0; }
+EOF
+  if test "$_xvid" != no && cc_check -l$_xvidcore -lm ; then
   _xvid=yes
-  _ld_xvid='-lxvidcore'
-  _def_xvid='#define HAVE_XVID 1'
+    _ld_xvid="-l$_xvidcore"
+    _def_xvid3='#undef HAVE_XVID3'
+    _def_xvid4='#define HAVE_XVID4 1'
   _codecmodules="xvid $_codecmodules"
-else
+  else
   _xvid=no
   _ld_xvid=''
-  _def_xvid='#undef HAVE_XVID'
+    _def_xvid3='#undef HAVE_XVID3'
+    _def_xvid4='#undef HAVE_XVID4'
   _nocodecmodules="xvid $_nocodecmodules"
+  fi
 fi
 echores "$_xvid"
 
@@ -5930,7 +5940,8 @@
 $_def_divx5
 
 /* Define if you are using XviD library */
-$_def_xvid
+$_def_xvid3
+$_def_xvid4
 $_def_decore_xvid
 $_def_encore_xvid