From 8114d1badf26e89c31b13aa3bc4c368e512894fe Mon Sep 17 00:00:00 2001 From: arpi Date: Mon, 14 Jan 2002 23:54:31 +0000 Subject: extra NULL field appended git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4158 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 136 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 38cda5f247..9f64a55a97 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -16,120 +16,120 @@ extern int readPPOpt(void *, char *arg); #ifdef HAVE_DIVX4ENCORE struct config divx4opts_conf[]={ - {"br", &divx4_param.bitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000}, - {"rc_period", &divx4_param.rc_period, CONF_TYPE_INT, 0,0,0}, - {"rc_reaction_period", &divx4_param.rc_reaction_period, CONF_TYPE_INT, 0,0,0}, - {"rc_reaction_ratio", &divx4_param.rc_reaction_ratio, CONF_TYPE_INT, 0,0,0}, - {"min_quant", &divx4_param.min_quantizer, CONF_TYPE_INT, CONF_RANGE,0,32}, - {"max_quant", &divx4_param.max_quantizer, CONF_TYPE_INT, CONF_RANGE,0,32}, - {"key", &divx4_param.max_key_interval, CONF_TYPE_INT, CONF_MIN,0,0}, - {"deinterlace", &divx4_param.deinterlace, CONF_TYPE_FLAG, 0,0,1}, - {"q", &divx4_param.quality, CONF_TYPE_INT, CONF_RANGE, 1, 5}, - {"crispness", &divx4_crispness, CONF_TYPE_INT, CONF_RANGE,0,100}, - {"help", "TODO: divx4opts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, - {NULL, NULL, 0, 0, 0, 0} + {"br", &divx4_param.bitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, + {"rc_period", &divx4_param.rc_period, CONF_TYPE_INT, 0,0,0, NULL}, + {"rc_reaction_period", &divx4_param.rc_reaction_period, CONF_TYPE_INT, 0,0,0, NULL}, + {"rc_reaction_ratio", &divx4_param.rc_reaction_ratio, CONF_TYPE_INT, 0,0,0, NULL}, + {"min_quant", &divx4_param.min_quantizer, CONF_TYPE_INT, CONF_RANGE,0,32, NULL}, + {"max_quant", &divx4_param.max_quantizer, CONF_TYPE_INT, CONF_RANGE,0,32, NULL}, + {"key", &divx4_param.max_key_interval, CONF_TYPE_INT, CONF_MIN,0,0, NULL}, + {"deinterlace", &divx4_param.deinterlace, CONF_TYPE_FLAG, 0,0,1, NULL}, + {"q", &divx4_param.quality, CONF_TYPE_INT, CONF_RANGE, 1, 5, NULL}, + {"crispness", &divx4_crispness, CONF_TYPE_INT, CONF_RANGE,0,100, NULL}, + {"help", "TODO: divx4opts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif #ifdef HAVE_MP3LAME struct config lameopts_conf[]={ - {"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9}, - {"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator}, - {"cbr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, 0}, - {"abr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, vbr_abr}, - {"mode", &lame_param_mode, CONF_TYPE_INT, CONF_RANGE, 0, MAX_INDICATOR}, - {"padding", &lame_param_padding, CONF_TYPE_INT, CONF_RANGE, 0, PAD_MAX_INDICATOR}, - {"br", &lame_param_br, CONF_TYPE_INT, CONF_RANGE, 0, 1024}, - {"ratio", &lame_param_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100}, - {"help", "TODO: lameopts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, - {NULL, NULL, 0, 0, 0, 0} + {"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, + {"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator, NULL}, + {"cbr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"abr", &lame_param_vbr, CONF_TYPE_FLAG, 0, 0, vbr_abr, NULL}, + {"mode", &lame_param_mode, CONF_TYPE_INT, CONF_RANGE, 0, MAX_INDICATOR, NULL}, + {"padding", &lame_param_padding, CONF_TYPE_INT, CONF_RANGE, 0, PAD_MAX_INDICATOR, NULL}, + {"br", &lame_param_br, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, + {"ratio", &lame_param_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, + {"help", "TODO: lameopts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif #ifdef USE_LIBAVCODEC struct config lavcopts_conf[]={ - {"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0}, - {"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000}, - {"vhq", &lavc_param_vhq, CONF_TYPE_FLAG, 0, 0, 1}, - {"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0}, - {NULL, NULL, 0, 0, 0, 0} + {"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL}, + {"vhq", &lavc_param_vhq, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif #ifdef USE_WIN32DLL struct config vfwopts_conf[]={ - {NULL, NULL, 0, 0, 0, 0} + {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif struct config ovc_conf[]={ - {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY}, - {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO}, - {"divx4", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_DIVX4}, - {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW}, - {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC}, - {"help", "\nAvailable codecs:\n copy\n frameno\n divx4\n raw\n lavc\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, - {NULL, NULL, 0, 0, 0, 0} + {"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}, + {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL}, + {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL}, + {"help", "\nAvailable codecs:\n copy\n frameno\n divx4\n raw\n lavc\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} }; struct config oac_conf[]={ - {"copy", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_COPY}, - {"pcm", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_PCM}, + {"copy", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_COPY, NULL}, + {"pcm", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_PCM, NULL}, #ifdef HAVE_MP3LAME - {"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3}, - {"help", "\nAvailable codecs:\n copy\n pcm\n mp3lame\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, + {"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL}, + {"help", "\nAvailable codecs:\n copy\n pcm\n mp3lame\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #else - {"mp3lame", "MPlayer was compiled without libmp3lame support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, - {"help", "\nAvailable codecs:\n copy\n pcm\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, + {"mp3lame", "MPlayer was compiled without libmp3lame support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"help", "\nAvailable codecs:\n copy\n pcm\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif - {NULL, NULL, 0, 0, 0, 0} + {NULL, NULL, 0, 0, 0, 0, NULL} }; -struct config conf[]={ +struct config mencoder_opts[]={ /* name, pointer, type, flags, min, max */ - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */ + {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, /* this must be the first!!! */ - {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0}, - {"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0}, + {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, + {"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"x", &vo_w, CONF_TYPE_INT, CONF_RANGE, 0, 4096}, - {"y", &vo_h, CONF_TYPE_INT, CONF_RANGE, 0, 4096}, + {"x", &vo_w, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"y", &vo_h, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, - {"mp3file", &mp3_filename, CONF_TYPE_STRING, 0, 0, 0}, - {"ac3file", &ac3_filename, CONF_TYPE_STRING, 0, 0, 0}, + {"mp3file", &mp3_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"ac3file", &ac3_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, -// {"oac", &out_audio_codec, CONF_TYPE_STRING, 0, 0, 0}, -// {"ovc", &out_video_codec, CONF_TYPE_STRING, 0, 0, 0}, - {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, - {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, +// {"oac", &out_audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL}, +// {"ovc", &out_video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4}, + {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL}, #ifdef HAVE_DIVX4ENCORE - {"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2}, - {"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0}, + {"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2, NULL}, + {"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, + {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif #ifdef HAVE_MP3LAME - {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, + {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif #ifdef USE_LIBAVCODEC - {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, + {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif #ifdef USE_WIN32DLL - {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, + {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif #define MAIN_CONF #include "cfg-common.h" #undef MAIN_CONF -// {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1}, - {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100}, - {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0}, -// {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, -// {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, -// {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, - {NULL, NULL, 0, 0, 0, 0} +// {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, + {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0, NULL}, +// {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +// {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +// {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {NULL, NULL, 0, 0, 0, 0, NULL} }; -- cgit v1.2.3