Mercurial > mplayer.hg

changeset 24036:698aa9b7a44c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
AC3 --> AC-3
author diego
date Mon, 13 Aug 2007 22:50:44 +0000
parents a4c91224c78c
children c7f95196dfe5
files DOCS/man/en/mplayer.1 DOCS/xml/en/codecs.xml DOCS/xml/en/containers.xml DOCS/xml/en/encoding-guide.xml DOCS/xml/en/usage.xml DOCS/xml/en/video.xml
diffstat 6 files changed, 54 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Mon Aug 13 22:42:42 2007 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Aug 13 22:50:44 2007 +0000
@@ -1052,17 +1052,17 @@
 .
 .TP
 .B \-a52drc <level>
-Select the Dynamic Range Compression level for AC3 audio streams.
+Select the Dynamic Range Compression level for AC-3 audio streams.
 <level> is a float value ranging from 0 to 1, where 0 means no compression
 and 1 (which is the default) means full compression (make loud passages more
 silent and vice versa).
-This option only shows an effect if the AC3 stream contains the required range
+This option only shows an effect if the AC-3 stream contains the required range
 compression information.
 .
 .TP
 .B \-aid <ID> (also see \-alang)
 Select audio channel (MPEG: 0\-31, AVI/\:OGM: 1\-99, ASF/\:RM: 0\-127,
-VOB(AC3): 128\-159, VOB(LPCM): 160\-191, MPEG-TS 17\-8190).
+VOB(AC-3): 128\-159, VOB(LPCM): 160\-191, MPEG-TS 17\-8190).
 MPlayer prints the available audio IDs when run in verbose (\-v) mode.
 When playing an MPEG-TS stream, MPlayer/\:MEncoder will use the first program
 (if present) with the chosen audio stream.
@@ -1183,14 +1183,14 @@
 MPlayer asks the decoder to decode the audio into as many channels as
 specified.
 Then it is up to the decoder to fulfill the requirement.
-This is usually only important when playing videos with AC3 audio (like DVDs).
+This is usually only important when playing videos with AC-3 audio (like DVDs).
 In that case liba52 does the decoding by default and correctly downmixes the
 audio into the requested number of channels.
 To directly control the number of output channels independently of how many
 channels are decoded, use the channels filter.
 .br
 .I NOTE:
-This option is honored by codecs (AC3 only), filters (surround) and audio
+This option is honored by codecs (AC-3 only), filters (surround) and audio
 output drivers (OSS at least).
 .sp 1
 Available options are:
@@ -1254,7 +1254,7 @@
 .
 .TP
 .B \-dumpaudio (MPlayer only)
-Dumps raw compressed audio stream to ./stream.dump (useful with MPEG/\:AC3,
+Dumps raw compressed audio stream to ./stream.dump (useful with MPEG/\:AC-3,
 in most other cases the resulting file will not be playable).
 If you give more than one of \-dumpaudio, \-dumpvideo, \-dumpstream
 on the command line only the last one will work.
@@ -1601,7 +1601,7 @@
 This option lets you play raw audio files.
 You have to use \-demuxer rawaudio as well.
 It may also be used to play audio CDs which are not 44kHz 16-bit stereo.
-For playing raw AC3 streams use \-rawaudio format=0x2000 \-demuxer rawaudio.
+For playing raw AC-3 streams use \-rawaudio format=0x2000 \-demuxer rawaudio.
 .sp 1
 Available options are:
 .sp 1
@@ -4027,7 +4027,7 @@
 .IPs "\-ac mad,"
 Try libmad first, then fall back on others.
 .IPs "\-ac hwac3,a52,"
-Try hardware AC3 passthrough, software AC3, then others.
+Try hardware AC-3 passthrough, software AC-3, then others.
 .IPs "\-ac hwdts,"
 Try hardware DTS passthrough, then fall back on others.
 .IPs "\-ac -ffmp3,"
--- a/DOCS/xml/en/codecs.xml	Mon Aug 13 22:42:42 2007 +0000
+++ b/DOCS/xml/en/codecs.xml	Mon Aug 13 22:50:44 2007 +0000
@@ -359,11 +359,11 @@
   Windows Media Audio 9 (WMAv3) (using DMO DLL)
 </para></listitem>
 <listitem><para>
-  AC3 Dolby audio (<emphasis role="bold">native</emphasis> code, with
+  AC-3 Dolby audio (<emphasis role="bold">native</emphasis> code, with
   MMX/SSE/3DNow! optimization)
 </para></listitem>
 <listitem><para>
-  AC3 passing through sound card hardware
+  AC-3 passing through sound card hardware
 </para></listitem>
 <listitem><para>
   AAC
@@ -372,7 +372,7 @@
   Ogg Vorbis audio codec (<emphasis role="bold">native</emphasis> library)
 </para></listitem>
 <listitem><para>
-  RealAudio: DNET (low bitrate AC3), Cook, Sipro and ATRAC3
+  RealAudio: DNET (low bitrate AC-3), Cook, Sipro and ATRAC3
 </para></listitem>
 <listitem><para>
   QuickTime: Qualcomm and QDesign audio codecs
@@ -395,17 +395,17 @@
 <!-- ********** -->
 
 <sect2 id="swac3">
-<title>Software AC3 decoding</title>
+<title>Software AC-3 decoding</title>
 
 <para>
-This is the default decoder used for files with AC3 audio.
+This is the default decoder used for files with AC-3 audio.
 </para>
 
 <para>
-The AC3 decoder can create audio output mixes for 2, 4, or 6 speakers.
+The AC-3 decoder can create audio output mixes for 2, 4, or 6 speakers.
 When configured for 6 speakers, this decoder provides separate output of
-all the AC3 channels to the sound driver, allowing for full "surround
-sound" experience without the external AC3 decoder required to use the
+all the AC-3 channels to the sound driver, allowing for full "surround
+sound" experience without the external AC-3 decoder required to use the
 hwac3 codec.
 </para>
 
@@ -415,7 +415,7 @@
 channel downmix (Left Front, Right Front, Left Surround and Right Surround
 outputs), use <option>-channels 4</option>.  In this case, any center
 channel will be mixed equally to the front channels.
-<option>-channels 6</option> will output all the AC3 channels as they are
+<option>-channels 6</option> will output all the AC-3 channels as they are
 encoded - in the order Left, Right, Left Surround, Right Surround, Center and
 LFE.
 </para>
@@ -436,12 +436,12 @@
 <!-- ********** -->
 
 <sect2 id="hwac3">
-<title>Hardware AC3 decoding</title>
+<title>Hardware AC-3 decoding</title>
 
 <para>
-You need an AC3 capable sound card, with digital out (S/PDIF). The card's
+You need an AC-3 capable sound card, with digital out (S/PDIF). The card's
 driver must properly support the AFMT_AC3 format (C-Media does).  Connect
-your AC3 decoder to the S/PDIF output, and use the <option>-ac
+your AC-3 decoder to the S/PDIF output, and use the <option>-ac
 hwac3</option> option. It is experimental but known to work with C-Media
 cards and Soundblaster Live! + ALSA (but not OSS) drivers and DXR3/Hollywood+
 MPEG decoder cards.
--- a/DOCS/xml/en/containers.xml	Mon Aug 13 22:42:42 2007 +0000
+++ b/DOCS/xml/en/containers.xml	Mon Aug 13 22:50:44 2007 +0000
@@ -61,7 +61,7 @@
 <listitem><para>
   VOB: This is the MPEG file format on <emphasis role="bold">DVDs</emphasis>.
   It is the same as MPG, plus the capability to contain subtitles or non-MPEG
-  (AC3) audio. It contains encoded MPEG-2 video and usually AC3 audio, but DTS,
+  (AC-3) audio. It contains encoded MPEG-2 video and usually AC-3 audio, but DTS,
   MP2 and uncompressed LPCM are allowed, too. <emphasis role="bold">Read the
   <link linkend="dvd">DVD</link> section</emphasis>!
 </para></listitem>
--- a/DOCS/xml/en/encoding-guide.xml	Mon Aug 13 22:42:42 2007 +0000
+++ b/DOCS/xml/en/encoding-guide.xml	Mon Aug 13 22:50:44 2007 +0000
@@ -1517,14 +1517,14 @@
 <para>
 Audio is a much simpler problem to solve: if you care about quality, just
 leave it as is.
-Even AC3 5.1 streams are at most 448Kbit/s, and they are worth every bit.
+Even AC-3 5.1 streams are at most 448Kbit/s, and they are worth every bit.
 You might be tempted to transcode the audio to high quality Vorbis, but
-just because you do not have an A/V receiver for AC3 pass-through today
+just because you do not have an A/V receiver for AC-3 pass-through today
 does not mean you will not have one tomorrow. Future-proof your DVD rips by
-preserving the AC3 stream.
-You can keep the AC3 stream either by copying it directly into the video
+preserving the AC-3 stream.
+You can keep the AC-3 stream either by copying it directly into the video
 stream <link linkend="menc-feat-mpeg4">during the encoding</link>.
-You can also extract the AC3 stream in order to mux it into containers such
+You can also extract the AC-3 stream in order to mux it into containers such
 as NUT or Matroska.
 <screen>
 mplayer <replaceable>source_file.vob</replaceable> -aid 129 -dumpaudio -dumpfile <replaceable>sound.ac3</replaceable>
@@ -1569,7 +1569,7 @@
 The correct way to handle this kind of problem is to insert silence or
 cut audio at these points.
 However <application>MPlayer</application> cannot do that, so if you
-demux the AC3 audio and encode it with a separate app (or dump it to PCM with
+demux the AC-3 audio and encode it with a separate app (or dump it to PCM with
 <application>MPlayer</application>), the splices will be left incorrect
 and the only way to correct them is to drop/dup video frames at the
 splice.
@@ -1731,7 +1731,7 @@
   Unfortunately, the most efficient codec, Vorbis, does not meet
   either of these requirements.
   Therefore, if you plan to store your movie in AVI, you will have to
-  use a less efficient codec such as MP3 or AC3.
+  use a less efficient codec such as MP3 or AC-3.
 </para></listitem>
 </orderedlist>
 
@@ -2600,7 +2600,7 @@
 </row>
 <row>
   <entry>ac3</entry>
-  <entry>AC3, AKA Dolby Digital</entry>
+  <entry>AC-3, AKA Dolby Digital</entry>
 </row>
 <row>
   <entry>adpcm_ima_wav</entry>
@@ -2635,7 +2635,7 @@
 </para>
 
 <informalexample><para>
-An example with AC3 compression:
+An example with AC-3 compression:
 <screen>
 mencoder dvd://2 -o <replaceable>title2.avi</replaceable> -oac lavc -lavcopts acodec=ac3 -ovc copy
 </screen>
@@ -4746,7 +4746,7 @@
   <entry>MPEG-2</entry>
   <entry>9800 kbps</entry>
   <entry>48000 Hz</entry>
-  <entry>AC3,PCM</entry>
+  <entry>AC-3,PCM</entry>
   <entry>1536 kbps (max)</entry>
   <entry>30000/1001, 24000/1001</entry>
   <entry>4:3, 16:9 (only for 720x480)</entry>
@@ -4759,7 +4759,7 @@
   <entry>MPEG-1</entry>
   <entry>1856 kbps</entry>
   <entry>48000 Hz</entry>
-  <entry>AC3,PCM</entry>
+  <entry>AC-3,PCM</entry>
   <entry>1536 kbps (max)</entry>
   <entry>30000/1001, 24000/1001</entry>
   <entry>4:3, 16:9</entry>
@@ -4792,7 +4792,7 @@
   <entry>MPEG-2</entry>
   <entry>9800 kbps</entry>
   <entry>48000 Hz</entry>
-  <entry>MP2,AC3,PCM</entry>
+  <entry>MP2,AC-3,PCM</entry>
   <entry>1536 kbps (max)</entry>
   <entry>25</entry>
   <entry>4:3, 16:9 (only for 720x576)</entry>
@@ -4803,7 +4803,7 @@
   <entry>MPEG-1</entry>
   <entry>1856 kbps</entry>
   <entry>48000 Hz</entry>
-  <entry>MP2,AC3,PCM</entry>
+  <entry>MP2,AC-3,PCM</entry>
   <entry>1536 kbps (max)</entry>
   <entry>25</entry>
   <entry>4:3, 16:9</entry>
@@ -5169,7 +5169,7 @@
 
 <para>
 For DVD audio, <systemitem class="library">libavcodec</systemitem>'s
-AC3 codec is used.
+AC-3 codec is used.
 </para>
 
 
@@ -5255,10 +5255,10 @@
 
 
 <sect3 id="menc-feat-vcd-dvd-all-pal-ac3-copy">
-<title>PAL AVI Containing AC3 Audio to DVD</title>
-
-<para>
-If the source already has AC3 audio, use -oac copy instead of re-encoding it.
+<title>PAL AVI Containing AC-3 Audio to DVD</title>
+
+<para>
+If the source already has AC-3 audio, use -oac copy instead of re-encoding it.
 <screen>
 mencoder -oac copy -ovc lavc -of mpeg -mpegopts format=dvd:tsaf \
   -vf scale=720:576,harddup -ofps 25 \
@@ -5270,10 +5270,10 @@
 
 
 <sect3 id="menc-feat-vcd-dvd-all-ntsc-ac3-copy">
-<title>NTSC AVI Containing AC3 Audio to DVD</title>
-
-<para>
-If the source already has AC3 audio, and is NTSC @ 24000/1001 fps:
+<title>NTSC AVI Containing AC-3 Audio to DVD</title>
+
+<para>
+If the source already has AC-3 audio, and is NTSC @ 24000/1001 fps:
 <screen>
 mencoder -oac copy -ovc lavc -of mpeg -mpegopts format=dvd:tsaf:telecine \
   -vf scale=720:480,harddup -lavcopts vcodec=mpeg2video:vrc_buf_size=1835:\
--- a/DOCS/xml/en/usage.xml	Mon Aug 13 22:42:42 2007 +0000
+++ b/DOCS/xml/en/usage.xml	Mon Aug 13 22:50:44 2007 +0000
@@ -541,10 +541,10 @@
 
 
 <sect3 id="advaudio-surround-passthrough">
-<title>AC3/DTS Passthrough</title>
+<title>AC-3/DTS Passthrough</title>
 
 <para>
-DVDs usually have surround audio encoded in AC3 (Dolby Digital) or DTS
+DVDs usually have surround audio encoded in AC-3 (Dolby Digital) or DTS
 (Digital Theater System) format. Some modern audio equipment is capable of
 decoding these formats internally. <application>MPlayer</application> can be
 configured to relay the audio data without decoding it. This will only work if
@@ -552,7 +552,7 @@
 </para>
 
 <para>
-If your audio equipment can decode both AC3 and DTS, you can safely enable
+If your audio equipment can decode both AC-3 and DTS, you can safely enable
 passthrough for both formats. Otherwise, enable passthrough for only the format
 your equipment supports.
 </para>
@@ -560,13 +560,13 @@
 <itemizedlist>
 <title>To enable passthrough on the command line:</title>
 <listitem><para>
-  For AC3 only, use <option>-ac hwac3</option>
+  For AC-3 only, use <option>-ac hwac3</option>
 </para></listitem>
 <listitem><para>
   For DTS only, use <option>-ac hwdts</option>
 </para></listitem>
 <listitem><para>
-  For both AC3 and DTS, use <option>-afm hwac3</option>
+  For both AC-3 and DTS, use <option>-afm hwac3</option>
 </para></listitem>
 </itemizedlist>
 
@@ -574,13 +574,13 @@
 <title>To enable passthrough in the <application>MPlayer</application>
   configuration file: </title>
 <listitem><para>
-  For AC3 only, use <option>ac=hwac3,</option>
+  For AC-3 only, use <option>ac=hwac3,</option>
 </para></listitem>
 <listitem><para>
   For DTS only, use <option>ac=hwdts,</option>
 </para></listitem>
 <listitem><para>
-  For both AC3 and DTS, use <option>afm=hwac3</option>
+  For both AC-3 and DTS, use <option>afm=hwac3</option>
 </para></listitem>
 </itemizedlist>
 
@@ -588,7 +588,7 @@
 Note that there is a comma (",") at the end of
 <option>ac=hwac3,</option> and <option>ac=hwdts,</option>. This will make
 <application>MPlayer</application> fall back on the codecs it normally uses when
-playing a file that does not have AC3 or DTS audio.
+playing a file that does not have AC-3 or DTS audio.
 <option>afm=hwac3</option> does not need a comma;
 <application>MPlayer</application> will fall back anyway when an audio family
 is specified.
@@ -708,7 +708,7 @@
 
 <para>
 Unfortunately, there is no standard for how channels are ordered. The orders
-listed below are those of AC3 and are fairly typical; try them and see if your
+listed below are those of AC-3 and are fairly typical; try them and see if your
 source matches. Channels are numbered starting with 0.
 
 <orderedlist spacing="compact">
@@ -996,7 +996,7 @@
   since we only care about the output of the first two channels, we only need to
   make two sets; the remaining four sets can be omitted. Beware that not all
   multichannel audio files have the same channel order! This example
-  demonstrates downmixing a file with the same channels as AC3 5.1:
+  demonstrates downmixing a file with the same channels as AC-3 5.1:
   <programlisting>
 0 - front left
 1 - front right
--- a/DOCS/xml/en/video.xml	Mon Aug 13 22:42:42 2007 +0000
+++ b/DOCS/xml/en/video.xml	Mon Aug 13 22:50:44 2007 +0000
@@ -2116,7 +2116,7 @@
 <varlistentry>
   <term><option>-ac hwac3</option></term>
   <listitem><para>
-  The em8300 supports playing back AC3 audio (surround sound) through the
+  The em8300 supports playing back AC-3 audio (surround sound) through the
   digital audio output of the card. See the <option>-ao oss</option> option
   above, it must be used to specify the DXR3's output instead of a sound card.
   </para></listitem>