[MPlayer-DOCS] CVS: main/DOCS/man/en mplayer.1,1.687,1.688
Diego Biurrun CVS
syncmail at mplayerhq.hu
Sat Aug 28 22:36:37 CEST 2004
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/DOCS/man/en
In directory mail:/var2/tmp/cvs-serv17494/DOCS/man/en
Modified Files:
mplayer.1
Log Message:
fall back to --> fall back on, some consistency
Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -r1.687 -r1.688
--- mplayer.1 28 Aug 2004 20:00:46 -0000 1.687
+++ mplayer.1 28 Aug 2004 20:36:34 -0000 1.688
@@ -670,7 +670,7 @@
.PD 0
.RSs
.IPs "\-alang hu,en"
-Plays Hungarian and falls back to English if Hungarian is not available.
+Plays Hungarian and falls back on English if Hungarian is not available.
.RE
.PD 1
.
@@ -940,7 +940,7 @@
By default, when the file type (demuxer) cannot be detected reliably
(the file has no header or it is not reliable enough), the filename
extension is used to select the demuxer.
-Always falls back to content-based demuxer selection.
+Always falls back on content-based demuxer selection.
.
.TP
.B \-passwd <password> (also see \-user) (network only)
@@ -949,12 +949,12 @@
.TP
.B \-prefer-ipv4 (network only)
Use IPv4 on network connections.
-Falls back to IPv6 automatically.
+Falls back on IPv6 automatically.
.
.TP
.B \-prefer-ipv6 (IPv6 network only)
Use IPv6 on network connections.
-Falls back to IPv4 automatically.
+Falls back on IPv4 automatically.
.
.TP
.B \-rawaudio <option1:option2:...>
@@ -1350,7 +1350,7 @@
.PD 0
.RSs
.IPs "\-slang hu,en"
-Selects Hungarian and falls back to English if Hungarian is not available.
+Selects Hungarian and falls back on English if Hungarian is not available.
.RE
.PD 1
.
@@ -1480,17 +1480,16 @@
make ENCA detect the codepage automatically.
If unsure, enter anything and watch mplayer \-v output for available
languages.
-Fallback codepage specifies the codepage to use, when the
-autodetection fails.
+Fallback codepage specifies the codepage to use, when autodetection fails.
.sp 1
.I EXAMPLE:
.PD 0
.RSs
.IPs "\-subcp enca:cs:latin2"
-Guess the encoding, assuming the subtitles are Czech, fall back to
+Guess the encoding, assuming the subtitles are Czech, fall back on
latin 2, if the detection fails.
.IPs "\-subcp enca:pl:cp1250"
-Guess the encoding for Polish, fall back to cp1250.
+Guess the encoding for Polish, fall back on cp1250.
.RE
.PD 1
.
@@ -1696,8 +1695,8 @@
.B \-ao <driver1[:suboption1[=value]:...],driver2,...[,]>
Specify a priority list of audio output drivers to be used.
.PP
-If the list has a trailing ',' it will fall back to drivers not listed
-on the command line.
+If the list has a trailing ',' MPlayer will fall back on drivers not
+contained in the list.
Suboptions are optional and can mostly be omitted.
.br
.I NOTE:
@@ -2289,8 +2288,8 @@
.B \-vo <driver1[:suboption1[=value]:...],driver2,...[,]>
Specify a priority list of video output drivers to be used.
.PP
-If the list has a trailing ',' it will fall back to drivers not listed on the
-command line.
+If the list has a trailing ',' MPlayer will fall back on drivers not
+contained in the list.
Suboptions are optional and can mostly be omitted.
.br
.I NOTE:
@@ -2749,7 +2748,8 @@
Specify a priority list of audio codecs to be used, according to their codec
name in codecs.conf.
Use a '-' before the codec name to omit it.
-If the list has a trailing ',' it will fallback to codecs not listed.
+If the list has a trailing ',' MPlayer will fall back on codecs not
+contained in the list.
.br
.I NOTE:
See \-ac help for a full list of available codecs.
@@ -2758,13 +2758,13 @@
.PD 0
.RSs
.IPs "\-ac mp3acm"
-force l3codeca.acm MP3 codec
+Force l3codeca.acm MP3 codec.
.IPs "\-ac mad,"
-try libmad first, then fallback to others
+Try libmad first, then fall back on others.
.IPs "\-ac hwac3,a52,"
-try hardware AC3 passthrough, then software AC3 codec, then others
+Try hardware AC3 passthrough, then software AC3 codec, then others.
.IPs "\-ac -ffmp3,"
-try other codecs except FFmpeg's MP3 decoder
+Skip FFmpeg's MP3 decoder.
.RE
.PD 1
.
@@ -2864,7 +2864,7 @@
.B \-afm <driver1,driver2,...>
Specify a priority list of audio codec families to be used, according
to their codec name in codecs.conf.
-It falls back to default if none is OK.
+Falls back on the default codecs if none of the given codec families work.
.br
.I NOTE:
See \-afm help for a full list of available drivers.
@@ -3149,7 +3149,8 @@
Specify a priority list of video codecs to be used, according to their codec
name in codecs.conf.
Use a '-' before the codec name to omit it.
-If the list has a trailing ',' it will fallback to codecs not listed.
+If the list has a trailing ',' MPlayer will fall back on codecs not
+contained in the list.
.br
.I NOTE:
See \-vc help for a full list of available codecs.
@@ -3160,7 +3161,7 @@
.IPs "\-vc divx"
Force Win32/\:VFW DivX codec, no fallback.
.IPs "\-vc divx4,"
-Try divx4linux codec first, then fall back to others.
+Try divx4linux codec first, then fall back on others.
.IPs "\-vc -divxds,-divx,"
Try other codecs except Win32 DivX codecs.
.IPs "\-vc ffmpeg12,mpeg12,"
@@ -3172,7 +3173,7 @@
.B \-vfm <driver1,driver2,...>
Specify a priority list of video codec families to be used, according
to their names in codecs.conf.
-It falls back to default if none is OK.
+Falls back on the default codecs if none of the given codec families work.
.br
.I NOTE:
See \-vfm help for a full list of available drivers.
@@ -3181,8 +3182,8 @@
.PD 0
.RSs
.IPs "\-vfm ffmpeg,dshow,vfw"
-Try the libavcodec, then Directshow, then VFW codecs and fall back
-to the others, if still none is OK.
+Try the libavcodec, then Directshow, then VfW codecs and fall back
+on others, if they do not work.
.IPs "\-vfm xanim"
Try XAnim codecs first.
.RE
More information about the MPlayer-DOCS
mailing list