# HG changeset patch
# User diego
# Date 1217685587 0
# Node ID 9020d4c7bd329e8aa3d46767e257e5276ef32290
# Parent  7cf315c4707f7fa916b7d92fa8576ab9081152de
Remove checks for HAVE_XVID3, that conditional was removed a long time ago.

diff -r 7cf315c4707f -r 9020d4c7bd32 cfg-common-opts.h
--- a/cfg-common-opts.h	Fri Aug 01 23:15:36 2008 +0000
+++ b/cfg-common-opts.h	Sat Aug 02 13:59:47 2008 +0000
@@ -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},
diff -r 7cf315c4707f -r 9020d4c7bd32 cfg-mencoder.h
--- a/cfg-mencoder.h	Fri Aug 01 23:15:36 2008 +0000
+++ b/cfg-mencoder.h	Sat Aug 02 13:59:47 2008 +0000
@@ -55,7 +55,7 @@
 #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 @@
 #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)