[Mplayer-cvslog] CVS: main cfg-common.h, 1.132, 1.133 cfg-mencoder.h, 1.85, 1.86

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv14143

Modified Files:
	cfg-common.h cfg-mencoder.h 
Log Message:
typos, wording and mistakes pointed out by the wanderer


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- cfg-common.h	3 May 2004 10:09:18 -0000	1.132
+++ cfg-common.h	3 May 2004 13:19:03 -0000	1.133
@@ -36,7 +36,7 @@
 
         {"dvdauth", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
         {"dvdkey", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
-	{"csslib", "libcss support is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+	{"csslib", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 
 #ifdef MPLAYER_NETWORK
 	{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -82,7 +82,7 @@
 	{"saveidx", &index_file_save, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"loadidx", &index_file_load, CONF_TYPE_STRING, 0, 0, 0, NULL},
 
-	// select audio/video subtitle stream
+	// select audio/video/subtitle stream
 	{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
 	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
 	{"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
@@ -189,7 +189,7 @@
 
         {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
         {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
-	{"tsfastparse", "-tsfastparse is not a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
+	{"tsfastparse", "-tsfastparse is no longer a valid option.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
 },
 	{"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},
 #define TS_MAX_PROBE_SIZE 2000000 /* don't forget to change this in libmpdemux/demux_ts.c too */
@@ -288,7 +288,7 @@
 /* defined in codec-cfg.c */
 extern char * codecs_file;
 
-/* from dec_audio, currently used for AC3 surround decoder only */
+/* from dec_audio, currently used for ac3surround decoder only */
 extern int audio_output_channels;
 
 #ifdef MPLAYER_NETWORK

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- cfg-mencoder.h	3 May 2004 10:09:18 -0000	1.85
+++ cfg-mencoder.h	3 May 2004 13:19:04 -0000	1.86
@@ -169,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},