[MPlayer-cvslog] r27394 - in trunk: cfg-common-opts.h cfg-mencoder.h

[diego]

Author: diego
Date: Sat Aug  2 15:59:47 2008
New Revision: 27394

Log:
Remove checks for HAVE_XVID3, that conditional was removed a long time ago.


Modified:
   trunk/cfg-common-opts.h
   trunk/cfg-mencoder.h

Modified: trunk/cfg-common-opts.h
==============================================================================
--- trunk/cfg-common-opts.h	(original)
+++ trunk/cfg-common-opts.h	Sat Aug  2 15:59:47 2008
@@ -257,7 +257,7 @@
 #ifdef CONFIG_LIBAVFORMAT
         {"lavfdopts",  lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
-#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
+#ifdef HAVE_XVID4
 	{"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 	{"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL},

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	(original)
+++ trunk/cfg-mencoder.h	Sat Aug  2 15:59:47 2008
@@ -55,7 +55,7 @@ const m_option_t ovc_conf[]={
 #ifdef HAVE_LIBDV095
 	"   libdv    - DV encoding with libdv v0.9.5\n"
 #endif
-#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
+#ifdef HAVE_XVID4
 	"   xvid     - XviD encoding\n"
 #endif
 #ifdef HAVE_X264
@@ -243,7 +243,7 @@ const m_option_t mencoder_opts[]={
 #ifdef CONFIG_WIN32DLL
 	{"xvfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
-#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
+#ifdef HAVE_XVID4
 	{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
 #if defined(HAVE_X264)