Mercurial > mplayer.hg

diff cfg-mencoder.h @ 12407:574b1ed2f9a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling, wording, consistency in comments and printed messages
author diego
date Mon, 03 May 2004 10:09:18 +0000
parents 5dac21977312
children ad1a2bad9248
line wrap: on
line diff
--- a/cfg-mencoder.h	Mon May 03 10:01:31 2004 +0000
+++ b/cfg-mencoder.h	Mon May 03 10:09:18 2004 +0000
@@ -1,3 +1,4 @@
+
 /*
  * config for cfgparser
  */
@@ -38,8 +39,8 @@
 	{"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #else
-	{"fast", "MPlayer was built without -lameopts fast support (requires libmp3lame >=3.92)!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"preset", "MPlayer was built without -lameopts preset support (requires libmp3lame >=3.92)!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"fast", "MPlayer was built without -lameopts fast support (requires libmp3lame >=3.92).\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"preset", "MPlayer was built without -lameopts preset support (requires libmp3lame >=3.92).\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 	{"help", MSGTR_MEncoderMP3LameHelp, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
@@ -74,29 +75,29 @@
 	{"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL},
 	{"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, NULL},
 	{"help", "\nAvailable codecs:\n"
-	"   copy     - frame copy, without re-encoding. doesn't work with filters!\n"
-	"   frameno  - special audio-only file for 3-pass encoding, see DOCS!\n"
+	"   copy     - frame copy, without re-encoding. Doesn't work with filters.\n"
+	"   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    - using XviD (divx4linux compat. mode)\n"
+	"   divx4    - XviD (divx4linux compatibility mode)\n"
 #else
-	"   divx4    - using divx4linux/divx5linux lib (depends on configuration)\n"
+	"   divx4    - divx4linux/divx5linux library (depends on configuration)\n"
 #endif
 #endif
 #ifdef USE_LIBAVCODEC
-	"   lavc     - using libavcodec codecs - best quality!\n"
+	"   lavc     - libavcodec codecs - best quality!\n"
 #endif
 #ifdef USE_WIN32DLL
-	"   vfw      - using VfW DLLs, currently only AVID is supported\n"
-	"   qtvideo  - using QuickTime DLLs, currently only SVQ1/3 are supported\n"
+	"   vfw      - VfW DLLs, currently only AVID is supported.\n"
+	"   qtvideo  - QuickTime DLLs, currently only SVQ1/3 are supported.\n"
 #endif
 #ifdef HAVE_LIBDV095
-	"   libdv    - DV encoding using libdv v0.9.5\n"
+	"   libdv    - DV encoding with libdv v0.9.5\n"
 #endif
 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
-	"   xvid     - xvid encoding\n"
+	"   xvid     - XviD encoding\n"
 #endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
@@ -108,12 +109,12 @@
 #ifdef HAVE_MP3LAME
 	{"mp3lame", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_VBRMP3, NULL},
 #else
-	{"mp3lame", "MPlayer was compiled without libmp3lame support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"mp3lame", "MPlayer was compiled without libmp3lame support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 #ifdef USE_LIBAVCODEC
 	{"lavc", &out_audio_codec, CONF_TYPE_FLAG, 0, 0, ACODEC_LAVC, NULL},
 #else
-	{"lavc", "MPlayer was compiled without libavcodec! See README or DOCS!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"lavc", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 	{"help", "\nAvailable codecs:\n"
 	"   copy     - frame copy, without re-encoding (useful for AC3)\n"
@@ -122,7 +123,7 @@
 	"   mp3lame  - cbr/abr/vbr MP3 using libmp3lame\n"
 #endif
 #ifdef USE_LIBAVCODEC
-	"   lavc     - ffmpeg audio encoder (mp2, ac3, ...)\n"
+	"   lavc     - FFmpeg audio encoder (MP2, AC3, ...)\n"
 #endif
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
@@ -137,13 +138,13 @@
 	{"srcform", &info_sourceform, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"comment", &info_comment, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"help", "\nAvailable INFO fields:\n"
-	"   name      - title of the subject of the file\n"
-	"   artist    - artist or author of the original subject of the file\n"
+	"   name      - title of the work\n"
+	"   artist    - artist or author of the work\n"
 	"   genre     - original work category\n"
-	"   subject   - contents of the file\n"
-	"   copyright - copyright information for the file\n"
-	"   srcform   - original form of the material that was digitized\n"
-	"   comment   - general comments about the file or the subject of the file\n"
+	"   subject   - contents of the work\n"
+	"   copyright - copyright information\n"
+	"   srcform   - original format of the digitzed material\n"
+	"   comment   - general comments about the work\n"
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
@@ -168,8 +169,8 @@
 
 	{"endpos", parse_end_at, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
 
-	// set output framerate - recommended for variable fps (.asf etc) files
-	// and for 29.97fps progressive mpeg2 streams
+	// set output framerate - recommended for variable fps (ASF etc) files
+	// and for 29.97fps progressive MPEG2 streams
 	{"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
 	{"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
 
@@ -182,8 +183,8 @@
 	{"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, 2, NULL},
 	{"audio-delay",   &audio_delay, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
 
-	{"x", "This option is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"xsize", "This option is obsolete, use -vf crop=w:h:x0:y0 for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"x", "-x is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"xsize", "-xsize is obsolete, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 
 	// output audio/video codec selection
 	{"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
@@ -198,7 +199,7 @@
 	// override avi aspect autodetection
 	{"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
 
-	{"pass", "The -pass option is obsolete. Use -lavcopts vpass=n or -divx4opts pass=n!\nRTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 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},
 	{"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	
 	{"vobsubout", &vobsub_out, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -226,7 +227,7 @@
 #ifdef USE_LIBAVCODEC
 	{"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #else
-	{"lavcopts", "MPlayer was compiled without libavcodec! See README or DOCS!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif
 #ifdef USE_WIN32DLL
 	{"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},