[MPlayer-users] mplayer -xxx help

Vladimir Mosgalin mosgalin at VM10124.spb.edu
Tue Jan 28 01:14:38 CET 2003


On Mon, 27 Jan 2003, Arpi wrote:

Well, here is patch that adds
"-input/cdda/mf/rawaudio/af-adv/aop/lavdopts/ssf/tv/jpeg/xvidopts help"
options to mplayer/mencoder and "-divx4opts/xvidencopts help" to
mencoder (-lavcopts help isn't complete yet, too much options there...).

This isn't final patch, I just want someone to check it for spelling and
errors, since I don't know English too well. Also I can't test xvid and
dxr2 options, it may even fail to compile on those, maybe somebody can
test this. Report any problems and suggestions to me.
Don't forget to run configure after patching.

Patch is against 20030127 cvs, but there should be no serious problems
with other versions.

-- 

Vladimir
-------------- next part --------------
diff -Naur MPlayer-20030127.old/cfg-common.h MPlayer-20030127/cfg-common.h
--- MPlayer-20030127.old/cfg-common.h	Mon Jan 27 16:23:28 2003
+++ MPlayer-20030127/cfg-common.h	Tue Jan 28 01:07:47 2003
@@ -276,6 +276,7 @@
 #endif
 	{"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"audioid", &tv_param_audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
+	{"help", MSGTR_HelpOption_tv, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 #endif
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
@@ -295,6 +296,7 @@
 	{"chs", &sws_chr_hshift, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"ls", &sws_lum_sharpen, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
 	{"cs", &sws_chr_sharpen, CONF_TYPE_FLOAT, 0, 0, 100.0, NULL},
+	{"help", MSGTR_HelpOption_ssf, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -335,6 +337,7 @@
         {"h", &mf_h, CONF_TYPE_INT, 0, 0, 0, NULL},
         {"fps", &mf_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL},
         {"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL},
+        {"help", MSGTR_HelpOption_mf, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
         {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 						
diff -Naur MPlayer-20030127.old/cfg-mencoder.h MPlayer-20030127/cfg-mencoder.h
--- MPlayer-20030127.old/cfg-mencoder.h	Mon Jan 27 16:23:28 2003
+++ MPlayer-20030127/cfg-mencoder.h	Mon Jan 27 19:58:28 2003
@@ -211,8 +211,8 @@
 //	{"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
 	{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL, 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}
+/*	{"-help", mencoder_help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"help", mencoder_help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"h", mencoder_help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+*/	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
diff -Naur MPlayer-20030127.old/cfg-mplayer.h MPlayer-20030127/cfg-mplayer.h
--- MPlayer-20030127.old/cfg-mplayer.h	Mon Jan 27 16:23:28 2003
+++ MPlayer-20030127/cfg-mplayer.h	Tue Jan 28 03:01:44 2003
@@ -127,7 +127,8 @@
 extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
 struct config audio_filter_conf[]={       
 	{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
-        {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
+	{"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
+	{"help", MSGTR_HelpOption_af_adv, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -140,6 +141,7 @@
 	{"volume", &ao_plugin_cfg.pl_volume_volume, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL},
 	{"mul", &ao_plugin_cfg.pl_extrastereo_mul, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0, NULL},
 	{"softclip", &ao_plugin_cfg.pl_volume_softclip, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"help", MSGTR_HelpOption_aop, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -153,6 +155,7 @@
 	{"smooth", &jpeg_smooth, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
 	{"quality", &jpeg_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
 	{"outdir", &jpeg_outdir, CONF_TYPE_STRING, 0, 0, 0, NULL},
+	{"help", MSGTR_HelpOption_jpeg, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif
diff -Naur MPlayer-20030127.old/help/help_mp-en.h MPlayer-20030127/help/help_mp-en.h
--- MPlayer-20030127.old/help/help_mp-en.h	Mon Jan 27 16:23:32 2003
+++ MPlayer-20030127/help/help_mp-en.h	Tue Jan 28 02:03:24 2003
@@ -362,6 +362,216 @@
 #define MSGTR_MovieAspectIsSet "Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n"
 #define MSGTR_MovieAspectUndefined "Movie-Aspect is undefined - no prescaling applied.\n"
 
+// Help texts for -something help
+#define MSGTR_HelpOption_input \
+"\nAvailable input options:\n"\
+"	conf=<file>	: read alternative input.conf\n"\
+"	ar-delay=<value> : delay in msec before key autorepeat (0 to disable)\n"\
+"	ar-rate=<value>	: how many key presses per second when we autorepeat\n"\
+"	keylist		: prints all keys that can be bound\n"\
+"	cmdlist		: prints all commands that canbe bound\n"\
+"	js-dev=<value>	: specifies the joystick device to use\n"\
+"	file=<file>	: read commands from given file\n\n"
+#define MSGTR_HelpOption_cdda \
+"\nAvailable CD-DA options:\n"\
+"	speed=<value>	: set CD spin speed\n"\
+"	paranoia=<0-2>	: set paranoia level (0 - disable, 2 - full)\n"\
+"	generic-dev=<value> : use specified generic SCSI device\n"\
+"	sector-size=<value> : atomic read size\n"\
+"	overlap=<value>	: force minimum overlap search to <value> sectors\n"\
+"	toc-bias	: some Toshiba drives need this to correct work\n"\
+"	toc-offset=<value> : add <value> sectors when addressing tracks\n"\
+"	(no)skip	: (never) accept imperfect data reconstruction\n\n"
+#define MSGTR_HelpOption_mf \
+"\nAvailable multiple images decoding options:\n"\
+"	on		: turns on multifile support\n"\
+"	w=<value>	: width of the output (autodetect)\n"\
+"	h=<value>	: height of the output (autodetect)\n"\
+"	fps=<value>	: fps of the output (default: 25)\n"\
+"	type=<value>	: type of input files (jpeg, png or tga)\n\n"
+#define MSGTR_HelpOption_rawaudio \
+"\nAvailable raw audio playing options:\n"\
+"	on		: use raw audio demuxer\n"\
+"	channels=<value> : number of channels\n"\
+"	rate=<value>	: rate in samples per second\n"\
+"	samplesize=<value> : sample size in byte\n"\
+"	format=<value>	: fourcc in hex\n\n"
+#define MSGTR_HelpOption_aop \
+"\nAvailable audio plugins and their options:\n"\
+"	list=[plugins]	: comma separated list of plugins (resample,\n"\
+"			  surround, format, volume, extrastereo, volnorm)\n"\
+"	delay=<sec>	: example plugin, do not use\n"\
+"	format=<format>	: output format (format plugin only)\n"\
+"	fout=<Hz>	: output frequency (resample plugin only)\n"\
+"	volume=<0-255>	: volume (volume plugin only)\n"\
+"	mul=<value>	: stereo coefficient (default: 2.5) (extrastereo\n"\
+"			  plugin only)\n"\
+"	softclip	: compressor/'soft-clipping' (volume plugin only)\n\n"
+#define MSGTR_HelpOption_af_adv \
+"\nAvailable advanced audio filter options:\n"\
+"	force=<0-3>	: forces audio filters insertion mode:\n"\
+"				0: completely automatic (default)\n"\
+"				1: optimize for speed\n"\
+"				2: optimize for accuracy\n"\
+"				3: turn off audio\n"\
+"	list=<filters>	: same as -af option\n\n"
+#define MSGTR_HelpOption_jpeg \
+"\nAvailable JPEG output options:\n"\
+"	(no)progressive	: force (no)progressive JPEG files (default: no)\n"\
+"	(no)baseline	: force (no)baseline (default: yes)\n"\
+"	optimize=<value> : optimization value (default: 100)\n"\
+"	smooth=<value>	: toggle image smoothing (default: 0)\n"\
+"	quality=<0-100>	: higher quality leads to larger files (default: 75)\n"\
+"	outdir=<value>	: specify output directory\n\n"
+#define MSGTR_HelpOption_lavdopts \
+"\nAvailable libavcodec decoding options (use with care!):\n"\
+"	ec=<1-3>	: error concealment:\n"\
+"				1: strong deblock filter for damaged MBs\n"\
+"				2: iterative MV search\n"\
+"				3: all (default)\n"\
+"	er=<1-4>	: error resilience:\n"\
+"				0: disabled\n"\
+"				1: careful (should work with broken encoders)\n"\
+"				2: normal (default)\n"\
+"				3: aggressive (more checks but might cause\n"\
+"				problems even for valid bitstream)\n"\
+"				4: very aggressive\n"\
+"	bug=<value>	: manually work around encoder bugs:\n"\
+"				0: nothing\n"\
+"				1: autodetect bugs (default)\n"\
+"				2 (msmpeg4v3): some old lavc generated\n"\
+"				msmpeg4v3 files (no autodetect)\n"\
+"				4 (mpeg4): xvid interlacing bug\n"\
+"				8 (mpeg4): UMP4\n"\
+"				16 (mpeg4): padding bug\n"\
+"				32 (mpeg4): illegal vlc bug\n"\
+"				64 (mpeg4): XVID and DIVX qpel bug\n"\
+"	idct=<0-99>	: idct algorithm:\n"\
+"				0: automatically select a good one (default)\n"\
+"				1: jpeg reference integer\n"\
+"				2: simple\n"\
+"				3: simplemmx\n"\
+"				4: libmpeg2mmx\n"\
+"				5: ps2\n"\
+"				6: mlib\n"\
+"				7: arm\n"\
+"	gray		: grayscale only decoder (a bit faster than with color)\n\n"
+#define MSGTR_HelpOption_ssf \
+"\nAvailable SwScaler parameters:\n"\
+"	lgb=<0-100>	: Gaussian blur filter (luma)\n"\
+"	cgb=<0-100>	: Gaussian blur filter (chroma)\n"\
+"	ls=<0-100>	: sharpen filter (luma)\n"\
+"	cs=<0-100>	: sharpen filter (chroma)\n"\
+"	chs=<h>		: chroma horizontal shifting\n"\
+"	cvs=<v>		: chroma vertical shifting\n\n"
+#define MSGTR_HelpOption_tv \
+"\nAvailable TV grabbing options:\n"\
+"	on		: use TV input\n"\
+"	noaudio		: no sound\n"\
+"	driver=<value>	: dummy, v4l or bsdbt848 (not every may be available)\n"\
+"	device=<value>	: specify video device (default: /dev/video0)\n"\
+"	input=<value>	: specify other input the default 0 (Television)\n"\
+"	freq=<value>	: specify the frequency to set the tuner to (e.g.\n"\
+"			  511.250), not compatible with channels parameter\n"\
+"	outfmt=<value>	: tuner output format (yv12, rgb32, rgb24, rgb16,\n"\
+"			  rgb15, uyvy, yuy2, i420)\n"\
+"	width=<value>	: width of the output window\n"\
+"	height=<value>	: height of the output window\n"\
+"	fps=<value>	: framerate at which to capture video\n"\
+"	buffersize=<value> : maximum size of the capture bufer in Mb\n"\
+"	norm=<value>	: available: PAL, SECAM, NTSC\n"\
+"	channel=<value>	: set tuner to <value> channel\n"\
+"	chanlist=<value> : available: europe-east, europe-west, us-bcast,\n"\
+"			   us-cable, etc\n"\
+"	channels=<channel>-<name>,... : set names for channels\n"\
+"	audiorate=<value> : set audio capture bitrate\n"\
+"	forceaudio	: capture audio even if no audio sources reported\n"\
+"	alsa		: capture from ALSA\n"\
+"	amode=<0-3>	: audio mode (0: mono, 1: stereo, 2-3: language 1-2)\n"\
+"	forcechan=<1-2>	: force mono/stereo mode when detection fails\n"\
+"	adevice=<value>	: set an audio device, /dev/... for OSS, ID for ALSA\n"\
+"	audioid=<value>	: choose an audio output of the capture card\n"\
+"	[volume|bass|treble|balance]=<0-65535> : capture card mixer parameters\n"\
+"	immediatemode=<bool> : 0: capture audio and video together (mencoder\n"\
+"			       default), 1: video capture only, audio goes\n"\
+"			       through cable to soundcard (mplayer default)\n\n"
+#define MSGTR_HelpOption_xvidopts \
+"\nAvailable XviD decoder parameters:\n"\
+"	dr2		: activate direct rendering method 2\n"\
+"	nodr2		: deactivate direct rendering method 2\n\n"
+#define MSGTR_HelpOption_dxr2 \
+"\nAvailable dxr2 driver options:\n"\
+"	ar-mode=<0-2>	: aspect ratio mode (normal/pan scan/letterbox)\n"\
+"	iec958-encoded/decoded : iec958 output mode\n"\
+"	mute		: mute sound output\n"\
+"	ucode=<value>	: path to the microcode\n"\
+"	75ire		: enable 7.5 IRE\n"\
+"	bw		: b/w TV output\n"\
+"	color		: color TV output\n"\
+"	interlaced	: interlaced TV output\n"\
+"	macrovision=<0-3> : macrovision mode:\n"\
+"				0: off (default)\n"\
+"				1: agc\n"\
+"				2: agc 2 colorstripe\n"\
+"				3: agc 4 colorstripe\n"\
+"	norm=<value>	: TV norm (ntsc (default), pal,pal60,palm,paln,palnc)\n"\
+"	cr-[left|right|top|bot]=<-20-20> : adjust the overlay cropping\n"\
+"	ck-[rgb]min=<0-255> : minimum value for the color key\n"\
+"	ck-[rgb]max=<0-255> : maximum value for the color key\n"\
+"	ck-[rgb]=<0-255> : color key values\n"\
+"	ignore-cache	: do not use the VGA cache\n"\
+"	ol-osd		: enable the osd hack on the overlay\n"\
+"	ol[hwxy]-cor=<value> : adjust overlay size and position\n"\
+"	overlay		: enable the overlay\n"\
+"	overlay-ratio=<1-2500> : tune the overlay (default: 1000)\n"\
+"	update-cache	: recreate the VGA cache\n\n"
+#define MSGTR_HelpOption_divx4opts \
+"\nAvailable DivX4/5 encoding options:\n"\
+"	br=<value>	: target bitrage (kbit/s: <16000, bit/s: >16000)\n"\
+"	key=<value>	: maximum keyframe interval (in frames)\n"\
+"	deinterlace	: enable deinterlacing (avoid it, DivX4 is buggy)\n"\
+"	q=<1-5>		: quality (1-fastest, 5-best)\n"\
+"	min_quant=<1-31> : minimum quantizer\n"\
+"	max_quant=<1-31> : maximum quantizer\n"\
+"	rc_period=<value> : rate control period\n"\
+"	rc_reaction_period=<value> : rate control reaction period\n"\
+"	rc_reaction_ratio=<value> : rate control reaction ratio\n"\
+"	crispness=<0-100> : specify crispness/smoothness\n"\
+"	pass=<1-2>	: specify the pass in 2-pass mode\n"\
+"	vbrpass=<0-2>	: use XviD VBR Library instead of DivX4 VBR\n"\
+"				0: one pass encoding\n"\
+"				1: first pass, no AVI will be created\n"\
+"				2: second pass\n\n"
+#define MSGTR_HelpOption_xvidencopts \
+"\nAvailable XviD encoding options:\n"\
+"	pass=<1-2>	: specify the pass in 2-pass mode\n"\
+"	bitrate=<value>	: target bitrage in CBR or 2-pass mode (kbit/s:\n"\
+"			  <16000, bit/s: >16000) (default: 687 kbit/s)\n"\
+"	fixed_quant=<1-31> : switch to fixed quantizer mode\n"\
+"	me_quality=<0-6> : motion detection quality (default: 4)\n"\
+"	4mv		: use 4 motion vectors per MB (default: off)\n"\
+"	rc_reaction_delay_factor=<value> : rate control reaction speed\n"\
+"	rc_averaging_period=<value> : period to reach the required average\n"\
+"	rc_buffer=<value> : size of the rate control buffer\n"\
+"	quant_range=<1-31>-<1-31>[/<1-31>-<1-31>] :\n"\
+"			  min & max quantizer for all frames (CBR mode)\n"\
+"			  min & max quantizer for I/P frames (2-pass mode)\n"\
+"	min_key_interval=<value> : minimum interval between key frames\n"\
+"	max_key_interval=<value> : maximum interval between key frames\n"\
+"	mpeg_quant	: use MPEG quantizers instead of H.263 (default: off)\n"\
+"	mod_quant	: decide whether to use MPEG or H.263 quantizers on\n"\
+"			  a frame-by-frame basis (default=off)\n"\
+"	lumi_mask	: use a lumimasking algorithm (seems buggy)\n"\
+"	hintedme	: save ME vectors to file during first pass and\n"\
+"			  reuse them during the second (seems buggy)\n"\
+"	hintfile=<file> : file name for 'hintedme' (default: xvid_hint_me.dat)\n"\
+"	debug		: save per-frame statistics in xvid.dbg\n"\
+"	keyframe_boost=<0-1000> : (default=0, 2-pass mode only)\n"\
+"	kfthreshold=<value> : (default=10, 2-pass mode only)\n"\
+"	kfreduction=<0-100> : (default=30, 2-pass mode only)\n\n"
+#define MSGTR_HelpOption_lavcopts "\n-lavcopts help text.\n"
+
+
 // ====================== GUI messages/buttons ========================
 
 #ifdef HAVE_NEW_GUI
diff -Naur MPlayer-20030127.old/input/input.c MPlayer-20030127/input/input.c
--- MPlayer-20030127.old/input/input.c	Mon Jan 27 16:23:32 2003
+++ MPlayer-20030127/input/input.c	Tue Jan 28 01:07:47 2003
@@ -26,6 +26,7 @@
 #include "../linux/timer.h"
 #include "../mp_msg.h"
 #include "../cfgparser.h"
+#include "../help_mp.h"
 
 #include "joystick.h"
 
@@ -364,6 +365,7 @@
   { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
   { "js-dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
   { "file", &in_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
+  { "help", MSGTR_HelpOption_input, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
   { NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
diff -Naur MPlayer-20030127.old/libmpcodecs/vd_ffmpeg.c MPlayer-20030127/libmpcodecs/vd_ffmpeg.c
--- MPlayer-20030127.old/libmpcodecs/vd_ffmpeg.c	Mon Jan 27 16:23:35 2003
+++ MPlayer-20030127/libmpcodecs/vd_ffmpeg.c	Tue Jan 28 01:07:47 2003
@@ -96,6 +96,7 @@
 	{"idct", &lavc_param_idct_algo, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"ec", &lavc_param_error_concealment, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL},
 	{"vstats", &lavc_param_vstats, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"help", MSGTR_HelpOption_lavdopts, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 #if LIBAVCODEC_BUILD >= 4642
 	{"debug", &lavc_param_debug, CONF_TYPE_INT, CONF_RANGE, 0, 9999999, NULL},
 #endif
diff -Naur MPlayer-20030127.old/libmpcodecs/vd_xvid.c MPlayer-20030127/libmpcodecs/vd_xvid.c
--- MPlayer-20030127.old/libmpcodecs/vd_xvid.c	Mon Jan 27 16:23:35 2003
+++ MPlayer-20030127/libmpcodecs/vd_xvid.c	Tue Jan 28 01:07:47 2003
@@ -49,6 +49,7 @@
 struct config xvid_dec_opts[] = {
   { "dr2", &do_dr2, CONF_TYPE_FLAG, 0, 0, 1, NULL},
   { "nodr2", &do_dr2, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+  { "help", MSGTR_HelpOption_xvidopts, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
   {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
diff -Naur MPlayer-20030127.old/libmpcodecs/ve_divx4.c MPlayer-20030127/libmpcodecs/ve_divx4.c
--- MPlayer-20030127.old/libmpcodecs/ve_divx4.c	Mon Jan 27 16:23:35 2003
+++ MPlayer-20030127/libmpcodecs/ve_divx4.c	Tue Jan 28 02:51:04 2003
@@ -5,6 +5,7 @@
 
 #include "../config.h"
 #include "../mp_msg.h"
+#include "../help_mp.h"
 
 #ifdef HAVE_DIVX4ENCORE
 
@@ -90,7 +91,7 @@
 	{"vbrpass", &vbrpass, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
 	{"vbrdebug", &vbrdebug, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL},
 #endif
-	{"help", "TODO: divx4opts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"help", MSGTR_HelpOption_divx4opts, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
diff -Naur MPlayer-20030127.old/libmpcodecs/ve_lavc.c MPlayer-20030127/libmpcodecs/ve_lavc.c
--- MPlayer-20030127.old/libmpcodecs/ve_lavc.c	Mon Jan 27 16:23:35 2003
+++ MPlayer-20030127/libmpcodecs/ve_lavc.c	Tue Jan 28 02:51:04 2003
@@ -193,6 +193,7 @@
 	{"last_pred", &lavc_param_last_pred, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
 	{"preme", &lavc_param_pre_me, CONF_TYPE_INT, CONF_RANGE, 0, 2000, NULL},
 	{"subq", &lavc_param_me_subpel_quality, CONF_TYPE_INT, CONF_RANGE, 0, 8, NULL},
+	{"help", MSGTR_HelpOption_lavcopts, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
 #endif
diff -Naur MPlayer-20030127.old/libmpcodecs/ve_xvid.c MPlayer-20030127/libmpcodecs/ve_xvid.c
--- MPlayer-20030127.old/libmpcodecs/ve_xvid.c	Mon Jan 27 16:23:35 2003
+++ MPlayer-20030127/libmpcodecs/ve_xvid.c	Tue Jan 28 02:51:04 2003
@@ -5,6 +5,7 @@
 
 #include "../config.h"
 #include "../mp_msg.h"
+#include "../help_mp.h"
 
 #ifdef HAVE_XVID
 
@@ -127,6 +128,7 @@
     { "gmc", &xvidenc_gmc, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     { "me_colour", &xvidenc_me_colour, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif
+    { "help", MSGTR_HelpOption_xvidencopts, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
     { NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
diff -Naur MPlayer-20030127.old/libmpdemux/cdda.c MPlayer-20030127/libmpdemux/cdda.c
--- MPlayer-20030127.old/libmpdemux/cdda.c	Mon Jan 27 16:23:36 2003
+++ MPlayer-20030127/libmpdemux/cdda.c	Tue Jan 28 01:07:47 2003
@@ -4,6 +4,7 @@
 
 #include "stream.h"
 #include "../cfgparser.h"
+#include "../help_mp.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +30,7 @@
   { "toc-offset", &toc_offset, CONF_TYPE_INT, 0, 0, 0, NULL },
   { "noskip", &no_skip, CONF_TYPE_FLAG, 0 , 0, 1, NULL },
   { "skip", &no_skip, CONF_TYPE_FLAG, 0 , 1, 0, NULL },
+  { "help", MSGTR_HelpOption_cdda, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
   {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
diff -Naur MPlayer-20030127.old/libmpdemux/demux_rawaudio.c MPlayer-20030127/libmpdemux/demux_rawaudio.c
--- MPlayer-20030127.old/libmpdemux/demux_rawaudio.c	Mon Jan 27 16:23:37 2003
+++ MPlayer-20030127/libmpdemux/demux_rawaudio.c	Tue Jan 28 01:07:47 2003
@@ -7,6 +7,7 @@
 #include <string.h>
 
 #include "../cfgparser.h"
+#include "../help_mp.h"
 
 #include "stream.h"
 #include "demuxer.h"
@@ -25,6 +26,7 @@
   { "rate", &samplerate, CONF_TYPE_INT,CONF_RANGE,1000,8*48000, NULL },
   { "samplesize", &samplesize, CONF_TYPE_INT,CONF_RANGE,1,8, NULL },
   { "format", &format, CONF_TYPE_INT, CONF_MIN, 0 , 0, NULL },
+  { "help", MSGTR_HelpOption_rawaudio, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
   {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
diff -Naur MPlayer-20030127.old/libvo/vo_dxr2.c MPlayer-20030127/libvo/vo_dxr2.c
--- MPlayer-20030127.old/libvo/vo_dxr2.c	Mon Jan 27 16:23:37 2003
+++ MPlayer-20030127/libvo/vo_dxr2.c	Tue Jan 28 02:51:04 2003
@@ -129,6 +129,7 @@
   { "cr-right", &cr_right, CONF_TYPE_INT, CONF_RANGE, 0, 500, NULL},
   { "cr-top", &cr_top, CONF_TYPE_INT, CONF_RANGE, 0, 500, NULL},
   { "cr-bot", &cr_bot, CONF_TYPE_INT, CONF_RANGE, 0, 500, NULL},
+  { "help", MSGTR_HelpOption_dxr2, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 
   { NULL,NULL, 0, 0, 0, 0, NULL}
 };


More information about the MPlayer-users mailing list