diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-02 13:59:47 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-02 13:59:47 +0000 |
| commit | ba58bf37d6215f1f7a231f338396b9e6c091258e (patch) | |
| tree | a63300efa1bac0970ae2c7a98661643f46c0b38b | |
| parent | 9fd59e537952f8eea2124981710351ce28d12f9f (diff) | |
| download | mpv-ba58bf37d6215f1f7a231f338396b9e6c091258e.tar.bz2 mpv-ba58bf37d6215f1f7a231f338396b9e6c091258e.tar.xz | |
Remove checks for HAVE_XVID3, that conditional was removed a long time ago.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27394 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | cfg-common-opts.h | 2 | ||||
| -rw-r--r-- | cfg-mencoder.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 14b5f3a9eb..0726e17739 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -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 --git a/cfg-mencoder.h b/cfg-mencoder.h index 1cb5b55efa..4974597f22 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -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) |