Mercurial > mplayer.hg

changeset 12615:84e078fd64b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uniform VOBsub spelling
author diego
date Mon, 21 Jun 2004 12:47:41 +0000
parents d873777f0acf
children 4b4c748da990
files ChangeLog DOCS/man/en/mplayer.1 DOCS/xml/en/documentation.xml DOCS/xml/en/install.xml DOCS/xml/en/mencoder.xml DOCS/xml/en/usage.xml
diffstat 6 files changed, 28 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jun 20 22:11:28 2004 +0000
+++ b/ChangeLog	Mon Jun 21 12:47:41 2004 +0000
@@ -236,7 +236,7 @@
     * XviD API-4 (1.0 beta2) support
     * improved FLAC-in-Ogg support
     * Matroska: better AC3 detection
-    * Matroska: VobSubs, MP2, FLAC, AAC and HE-AAC support
+    * Matroska: VOBsubs, MP2, FLAC, AAC and HE-AAC support
     * improved detection of Real RTSP through URL analysis
     * fixed stereo 16 bit TWOS
     * fixed MPNG when using BGR24 images
@@ -336,7 +336,7 @@
     * improved FLAC configure detection
     * GUI file selector updated for newer formats
     * Fontconfig support
-    * proper VobSub seeking support
+    * proper VOBsub seeking support
     * removed oldskool libcss support (nobody uses it, it has drawbacks and
       possible security implications)
 
@@ -364,7 +364,7 @@
     * finally fixed the compilation on non-MVI capable Alpha CPUs
     * better AltiVec detection in configure
     * OSD menu now works on MinGW
-    * slave mode, vobsub and MEncoder support on Windows
+    * slave mode, VOBsub and MEncoder support on Windows
     * MinGW 3.1.0 supports MPlayer out of the box!
     * VIDIX and libdha ported to Windows
     * SDL on IRIX support
@@ -623,7 +623,7 @@
     * raw video support (-rawvideo, similar to -rawaudio)
     * experimental MPEG4-ES support (enable with -demuxer 27 -fps xxx)
     * new video filter: field (cheap deinterlacer)
-    * DVD/vobsub improvements: positioning, optional gaussian blur scaler
+    * DVD/VOBsub improvements: positioning, optional gaussian blur scaler
     * vf_bmovl: 400% speedup :)
     * libavcodec: native DV audio decoder
     * GIF demuxer (for animated GIFs)
@@ -734,7 +734,7 @@
     * fixed possible v4l capturing crash
     * merged the EDL 0.5 patch - using & creating edit-lists (runtime cut&skip)
     * subtitle alignment changeable: top/bottom/middle (key 'i')
-    * -slang support for VobSub files
+    * -slang support for VOBsub files
 
     VO:
     * X11 fullscreen switching code changed again (esp. for GNOME2/KDE 3.1)
@@ -900,7 +900,7 @@
     Features:
     * new audio filter layer (libaf) - automatic samplerate conversion
     * experimental -vo directx driver for Cygwin build
-    * unrarlib included for rar'ed vobsubs
+    * unrarlib included for rar'ed VOBsubs
     * native XviD encoding (-ovc xvid) interface for MEncoder
     * new softeq filter with gamma support: -vop eq2
     * -ao/-vo accepts list of drivers and can fall back to one, like -ac/-vc
@@ -999,7 +999,7 @@
     * Detection of AVI files which needs -ni
     * workaround for some Nandub bugs
     * Support for live.com RTP/RTSP streaming libraries
-    * Support to rip DVD subs in VobSub format
+    * Support to rip DVD subs in VOBsub format
     * bug fixes of mpsub/srt converter
     * Closed Captioning (ASCII subs on RC1 DVDs) support
     * Massive directfb updates
@@ -1096,14 +1096,14 @@
     * options -xy,-zoom,-flip usable with MEncoder, too, -xy keeps aspect
     * -vop lavc, using new fast best libavcodec for realtime MPEG1 transcoding
     * fixed GTK GUI crash with --disable-mencoder
-    * no more black vobsub subtitles :)
+    * no more black VOBsub subtitles :)
 
 
   pre1: Apr 21, 2002
     * 100% GPL - yeah, so what?
     * runtime CPU detection - x86 MPlayer binary can run on "any" other x86 CPU
     * video filter layer - with numerous plugins (crop, expand, etc)
-    * view or encode DVD/vobsub and/or text subtitles into the output AVI
+    * view or encode DVD/VOBsub and/or text subtitles into the output AVI
     * preliminary dvdnav support (experimental)
     * direct rendering - can't be used with libavcodec yet, sorry
     * display subtitles under the image, on black bands
--- a/DOCS/man/en/mplayer.1	Sun Jun 20 22:11:28 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Jun 21 12:47:41 2004 +0000
@@ -163,7 +163,7 @@
 European/\:ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic and Korean
 fonts are supported along with 11 subtitle formats (MicroDVD, SubRip,
 SubViewer, Sami, VPlayer, RT, SSA, AQTitle, JACOsub, PJS and our own: MPsub) and
-DVD subtitles (SPU streams, VobSub and Closed Captions).
+DVD subtitles (SPU streams, VOBsub and Closed Captions).
 .PP
 .B mencoder
 (MPlayer's Movie Encoder) is a simple movie encoder, designed to encode
@@ -228,7 +228,8 @@
 toggle fullscreen
 .IPs T\ \ \ \ 
 toggle stay-on-top.
-Supported by drivers which use X11, except SDL, as well as directx and gl2 under Windows.
+Supported by video out drivers which use X11, except SDL, as well as directx
+and gl2 under Windows.
 .IPs "w and e"
 decrease/\:increase panscan range
 .IPs o\ \ \ \ 
@@ -1215,8 +1216,8 @@
 Specifies the charset that will be passed to FriBiDi when decoding a non-UTF8
 subtitles (default: ISO8859-8).
 .TP
-.B \-ifo <vobsub\ ifo\ file>
-Indicate the file that will be used to load palette and frame size for VOBSUB
+.B \-ifo <VOBsub\ ifo\ file>
+Indicate the file that will be used to load palette and frame size for VOBsub
 subtitles.
 .TP
 .B \-noautosub
@@ -1269,7 +1270,7 @@
 .
 .TP
 .B \-spuaa <mode> (OSD only)
-Antialiasing/scaling mode for DVD/VobSub.
+Antialiasing/scaling mode for DVD/VOBsub.
 A value of 16 may be added to mode in order to force scaling even
 when original and scaled frame size already match, for example to
 smooth subtitles with the gaussian blur.
@@ -1291,7 +1292,7 @@
 .
 .TP
 .B \-spualign <-1\-2> (OSD only)
-Specify how spu (DVD/VobSub) subtitles should be aligned.
+Specify how spu (DVD/VOBsub) subtitles should be aligned.
 Values are the same as for \-subalign, with the extra choice -1 for original
 position.
 .TP
@@ -1453,13 +1454,13 @@
 .B \-utf8 \ \ 
 Tells MPlayer to handle the subtitle file as UTF8.
 .TP
-.B \-vobsub <vobsub\ file\ without\ extension>
-Specify the VobSub files that are to be used for subtitle.
+.B \-vobsub <VOBsub\ file\ without\ extension>
+Specify the VOBsub files that are to be used for subtitle.
 This is the full pathname without extensions, i.e.\& without
 the '.idx', '.ifo' or '.sub'.
 .TP
 .B \-vobsubid <0\-31>
-Specify the VobSub subtitle id.
+Specify the VOBsub subtitle id.
 .
 .
 .SH "AUDIO OUTPUT OPTIONS (MPLAYER ONLY)"
@@ -4217,7 +4218,7 @@
 .B \-vobsubout <basename>
 Specify the basename for the output .idx and .sub files.
 This turns off subtitle rendering in the encoded movie and diverts it to
-Vobsub subtitle files.
+VOBsub subtitle files.
 .TP
 .B \-vobsuboutid <langid>
 Specify the language two letter code for the subtitles.
--- a/DOCS/xml/en/documentation.xml	Sun Jun 20 22:11:28 2004 +0000
+++ b/DOCS/xml/en/documentation.xml	Mon Jun 21 12:47:41 2004 +0000
@@ -150,7 +150,7 @@
   into the output file
   </simpara></listitem>
 <listitem><simpara>
-  Can rip DVD subtitles to Vobsub format
+  Can rip DVD subtitles to VOBsub format
   </simpara></listitem>
 </itemizedlist>
 
--- a/DOCS/xml/en/install.xml	Sun Jun 20 22:11:28 2004 +0000
+++ b/DOCS/xml/en/install.xml	Mon Jun 21 12:47:41 2004 +0000
@@ -556,7 +556,7 @@
 <application>MPlayer</application> can display subtitles along with movie files.
 Currently the following formats are supported:
 <itemizedlist>
-<listitem><para>VobSub</para></listitem>
+<listitem><para>VOBsub</para></listitem>
 <listitem><para>OGM</para></listitem>
 <listitem><para>CC (closed caption)</para></listitem>
 <listitem><para>MicroDVD</para></listitem>
@@ -588,7 +588,7 @@
 
 <para>
 <application>MEncoder</application> can dump DVD subtitles into
-<link linkend="menc-feat-extractsub">VobSub</link> format.
+<link linkend="menc-feat-extractsub">VOBsub</link> format.
 </para>
 
 <para>
@@ -596,9 +596,9 @@
 </para>
 
 <formalpara>
-<title>VobSub subtitles</title>
+<title>VOBsub subtitles</title>
 <para>
-VobSub subtitles consist of a big (some megabytes) <filename>.SUB</filename> file,
+VOBsub subtitles consist of a big (some megabytes) <filename>.SUB</filename> file,
 and optional <filename>.IDX</filename> and/or <filename>.IFO</filename>
 files.  If you have files like
 <filename><replaceable>sample.sub</replaceable></filename>,
--- a/DOCS/xml/en/mencoder.xml	Sun Jun 20 22:11:28 2004 +0000
+++ b/DOCS/xml/en/mencoder.xml	Mon Jun 21 12:47:41 2004 +0000
@@ -356,11 +356,11 @@
 
 
 <sect1 id="menc-feat-extractsub">
-<title>Extracting DVD subtitles to Vobsub file</title>
+<title>Extracting DVD subtitles to VOBsub file</title>
 
 <para>
 <application>MEncoder</application> is capable of extracting subtitles from
-a DVD into Vobsub formatted files. They consist of a pair of files ending in
+a DVD into VOBsub formatted files. They consist of a pair of files ending in
 <filename>.idx</filename> and <filename>.sub</filename> and are usually
 packaged in a single <filename>.rar</filename> archive.
 <application>MPlayer</application> can play these with the
--- a/DOCS/xml/en/usage.xml	Sun Jun 20 22:11:28 2004 +0000
+++ b/DOCS/xml/en/usage.xml	Mon Jun 21 12:47:41 2004 +0000
@@ -289,7 +289,7 @@
   </para></listitem>
 <listitem><para><literal>vobsub_lang</literal></para>
   <para>
-  Change the language of VobSub subtitles.
+  Change the language of VOBsub subtitles.
   </para></listitem>
 <listitem><para><literal>vo_fullscreen</literal></para>
   <para>