summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-03 13:19:04 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-05-03 13:19:04 +0000
commit3ef2f6a8e8d6acc7fd5798a8010df53c878afcee (patch)
tree14ef066f6f45a4eff5d16f27aa7d38a80ced8abd
parent069e8ca739218ee7d78438197a6e1af00d1cfe7c (diff)
downloadmpv-3ef2f6a8e8d6acc7fd5798a8010df53c878afcee.tar.bz2
mpv-3ef2f6a8e8d6acc7fd5798a8010df53c878afcee.tar.xz
typos, wording and mistakes pointed out by the wanderer
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12409 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--cfg-common.h8
-rw-r--r--cfg-mencoder.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 7f1e5b7e59..500358fb4d 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -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 @@ extern int divx_quality;
/* 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
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index 97496828fb..56cc8ba92f 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -169,8 +169,8 @@ m_option_t mencoder_opts[]={
{"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},