diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-14 17:14:16 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-14 17:14:16 +0000 |
| commit | f89a7da6043d51f97e8c8c9d7cae64d205b21866 (patch) | |
| tree | dfb2920478c3c297ee68a0a5aaed33c9d3072fd9 /cfg-mencoder.h | |
| parent | cb2e693d2246c450842810b1e49452a49489938a (diff) | |
| download | mpv-f89a7da6043d51f97e8c8c9d7cae64d205b21866.tar.bz2 mpv-f89a7da6043d51f97e8c8c9d7cae64d205b21866.tar.xz | |
Remove support for obsolete and non-free divx4/odivx libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index db0abb6340..64b821edc5 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -8,19 +8,12 @@ #ifdef USE_FAKE_MONO extern int fakemono; // defined in dec_audio.c #endif -#ifdef HAVE_ODIVX_POSTPROCESS -extern int use_old_pp; -#endif extern int sws_flags; extern int readPPOpt(void *, char *arg); extern void revertPPOpt(void *conf, char* opt); extern char *pp_help; -#ifdef HAVE_DIVX4ENCORE -extern m_option_t divx4opts_conf[]; -#endif - #ifdef HAVE_MP3LAME extern m_option_t lameopts_conf[]; #endif @@ -62,7 +55,6 @@ extern m_option_t lavfopts_conf[]; m_option_t ovc_conf[]={ {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL}, {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO, NULL}, - {"divx4", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_DIVX4, NULL}, {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL}, // {"null", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NULL, NULL}, {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL}, @@ -77,13 +69,6 @@ m_option_t ovc_conf[]={ " frameno - special audio-only file for 3-pass encoding, see DOCS.\n" " raw - uncompressed video. Use fourcc option to set format explicitly.\n" " nuv - nuppel video\n" -#ifdef HAVE_DIVX4ENCORE -#ifdef ENCORE_XVID - " divx4 - XviD (divx4linux compatibility mode)\n" -#else - " divx4 - divx4linux/divx5linux library (depends on configuration)\n" -#endif -#endif #ifdef USE_LIBAVCODEC " lavc - libavcodec codecs - best quality!\n" #endif @@ -239,7 +224,7 @@ m_option_t mencoder_opts[]={ // override avi aspect autodetection {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL}, - {"pass", "-pass is obsolete, use -lavcopts vpass=n, -xvidencopts pass=n, -divx4opts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"pass", "-pass is obsolete, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, @@ -258,9 +243,6 @@ m_option_t mencoder_opts[]={ // info header strings {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#ifdef HAVE_DIVX4ENCORE - {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#endif #ifdef HAVE_MP3LAME {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif |