Mercurial > mplayer.hg

comparison cfg-mencoder.h @ 19082:a2f20562aac3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove support for obsolete and non-free divx4/odivx libraries.
author diego
date Fri, 14 Jul 2006 17:14:16 +0000
parents 83c42ca135c4
children 02a18c52a42a
comparison
equal deleted inserted replaced
19081:273bdef43012 19082:a2f20562aac3
5 5
6 #include "cfg-common.h" 6 #include "cfg-common.h"
7 7
8 #ifdef USE_FAKE_MONO 8 #ifdef USE_FAKE_MONO
9 extern int fakemono; // defined in dec_audio.c 9 extern int fakemono; // defined in dec_audio.c
10 #endif
11 #ifdef HAVE_ODIVX_POSTPROCESS
12 extern int use_old_pp;
13 #endif 10 #endif
14 11
15 extern int sws_flags; 12 extern int sws_flags;
16 extern int readPPOpt(void *, char *arg); 13 extern int readPPOpt(void *, char *arg);
17 extern void revertPPOpt(void *conf, char* opt); 14 extern void revertPPOpt(void *conf, char* opt);
18 extern char *pp_help; 15 extern char *pp_help;
19 16
20 #ifdef HAVE_DIVX4ENCORE
21 extern m_option_t divx4opts_conf[];
22 #endif
23
24 #ifdef HAVE_MP3LAME 17 #ifdef HAVE_MP3LAME
25 extern m_option_t lameopts_conf[]; 18 extern m_option_t lameopts_conf[];
26 #endif 19 #endif
27 20
28 #ifdef USE_LIBAVCODEC 21 #ifdef USE_LIBAVCODEC
60 #endif 53 #endif
61 54
62 m_option_t ovc_conf[]={ 55 m_option_t ovc_conf[]={
63 {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL}, 56 {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL},
64 {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO, NULL}, 57 {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO, NULL},
65 {"divx4", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_DIVX4, NULL},
66 {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL}, 58 {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL},
67 // {"null", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NULL, NULL}, 59 // {"null", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NULL, NULL},
68 {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL}, 60 {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL},
69 {"vfw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_VFW, NULL}, 61 {"vfw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_VFW, NULL},
70 {"libdv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBDV, NULL}, 62 {"libdv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBDV, NULL},
75 {"help", "\nAvailable codecs:\n" 67 {"help", "\nAvailable codecs:\n"
76 " copy - frame copy, without re-encoding. Doesn't work with filters.\n" 68 " copy - frame copy, without re-encoding. Doesn't work with filters.\n"
77 " frameno - special audio-only file for 3-pass encoding, see DOCS.\n" 69 " frameno - special audio-only file for 3-pass encoding, see DOCS.\n"
78 " raw - uncompressed video. Use fourcc option to set format explicitly.\n" 70 " raw - uncompressed video. Use fourcc option to set format explicitly.\n"
79 " nuv - nuppel video\n" 71 " nuv - nuppel video\n"
80 #ifdef HAVE_DIVX4ENCORE
81 #ifdef ENCORE_XVID
82 " divx4 - XviD (divx4linux compatibility mode)\n"
83 #else
84 " divx4 - divx4linux/divx5linux library (depends on configuration)\n"
85 #endif
86 #endif
87 #ifdef USE_LIBAVCODEC 72 #ifdef USE_LIBAVCODEC
88 " lavc - libavcodec codecs - best quality!\n" 73 " lavc - libavcodec codecs - best quality!\n"
89 #endif 74 #endif
90 #ifdef USE_WIN32DLL 75 #ifdef USE_WIN32DLL
91 " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n" 76 " vfw - VfW DLLs, read DOCS/HTML/en/encoding-guide.html.\n"
237 {"ffourcc", &force_fourcc, CONF_TYPE_STRING, CONF_GLOBAL, 4, 4, NULL}, 222 {"ffourcc", &force_fourcc, CONF_TYPE_STRING, CONF_GLOBAL, 4, 4, NULL},
238 223
239 // override avi aspect autodetection 224 // override avi aspect autodetection
240 {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL}, 225 {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL},
241 226
242 {"pass", "-pass is obsolete, use -lavcopts vpass=n, -xvidencopts pass=n, -divx4opts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, 227 {"pass", "-pass is obsolete, use -lavcopts vpass=n, -xvidencopts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
243 {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, 228 {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
244 229
245 {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, 230 {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
246 {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 31, NULL}, 231 {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 31, NULL},
247 {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, 232 {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
256 {"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, 241 {"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
257 242
258 // info header strings 243 // info header strings
259 {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 244 {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
260 245
261 #ifdef HAVE_DIVX4ENCORE
262 {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
263 #endif
264 #ifdef HAVE_MP3LAME 246 #ifdef HAVE_MP3LAME
265 {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 247 {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
266 #endif 248 #endif
267 #ifdef USE_LIBAVCODEC 249 #ifdef USE_LIBAVCODEC
268 {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 250 {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},