[MPlayer-translations] codecs.xml sync for Russian

Vladimir Voroshilov voroshil at gmail.com
Mon Sep 4 20:24:34 CEST 2006


Patch syncing DOCS/xml/ru/codecs.xml with English one.


-- 
Vladimir Voroshilov mailto:voroshil at gmail.com
Omsk State University
JID: voroshil at jabber.ru
ICQ: 95587719
-------------- next part --------------
Index: codecs.xml
===================================================================
--- codecs.xml	(revision 19668)
+++ codecs.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!-- synced with 1.44 -->
+<!-- synced with r19587 -->
 <sect1 id="codecs">
 <title>?????????????? ??????</title>
 
@@ -24,7 +24,7 @@
   </simpara></listitem>
 <listitem><simpara>
   "??????" ???????? ??? <emphasis role="bold">DivX ;-), OpenDivX (DivX4),
-  DivX (Pro), 3ivX, M$ MPEG4</emphasis> v1, v2 ? ?????? ????????? MPEG4.
+  DivX 5 (Pro), 3ivX, M$ MPEG-4</emphasis> v1, v2 ? ?????? ????????? MPEG-4.
   </simpara></listitem>
 <listitem><simpara>
   "??????" ??????? ??? <emphasis role="bold">Windows Media Video 7/8</emphasis>
@@ -76,122 +76,6 @@
 </para>
 
 
-<sect3 id="divx4-5">
-<title>DivX4/DivX5</title>
-
-<para>
-??? ?????? ???????? ?????????? ? DivX4 b DivX5 ??????? ??
-<ulink url="http://www.projectmayo.com">Project Mayo</ulink>.
-?? ??????? ?????????? ????? ???????? ???? OpenDivX alpha 47 ? 48.
-? ??????? ????????? ??? ??? ???? ???????? ? <application>MPlayer</application>
-? ?????????? ?? ?????????. ????? ?? ???????????? ?? ??? ?????????????
-??? ??????????????? ????????? ???????? ??????????? ? MPEG1/2 ???????.
-?????? ?? ?????????? ??? ??????????? ?????? ??? ?????? ???? ?????.
-</para>
-
-<para>
-????? ????????? ????? ?????? ?????????? DivX4 ? ???? ????? ???????????? ??????,
-????????? ??????????? DivX ???????! ? ?????????? ? ?????, ?? ???????????
-???????, ??? Win32 DivX DLL'?, ?? ?????????, ???
-<systemitem class="library">libavcodec</systemitem>.
-???????, ???????????? ??? ? ???????? ????????
-<emphasis role="bold">?? ?????????????</emphasis>. ????, ?? ???????
-??? ???????????. ???????????? ??????????? ????? ?????? ???????? ??, ??? ??
-?? ???????? ?? ???????? ? ???????? ???????? ?????[Open Source license]
-</para>
-
-<para>
-DivX4 ???????? ? ???? ???????:
-<variablelist>
-<varlistentry><term><option>-vc odivx</option></term>
-<listitem><simpara>
-  ???????????? ????? ? ?????? OpenDivX. ? ???? ??????, ?? ?????? YV12
-  ??????????? ? ????? ??????????? ??????, ? <application>MPlayer</application>
-  ??? ???????? ???????????? ?????? ????? libvo. (<emphasis role="bold">??????,
-  ?????????????!</emphasis>)
-  </simpara></listitem>
-</varlistentry>
-<varlistentry><term><option>-vc divx4</option></term>
-<listitem><simpara>
-  ???????????? ????????? ???????????? ?????? ? ??????. ? ???? ?????? ?? ?????
-  ?????? ???????????? YUY2/UYVY. (<emphasis role="bold">????????</emphasis>)
-  </simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-????? <option>-vc odivx</option> ?????? ???????, ????????? ??? ???? ???????????
-?????????? ? YV12 ??????? (???????? YUV 4:2:0), ? ??????? ????????? ?????
-??????? ?????????? ??????????? ????. ??? ??????????? YUV ??????? (YUY2, UYVY)
-??????????? ????? <option>-vc divx4</option>. ? RGB ??????? ???????? - ????? ??,
-?????????? ? ?????? ?????? ??-?? ??????? ??????? ?????.
-<note>
-<para>
-???? ??? <option>-vo</option> ??????? ???????????? ?????? ?????, ?? <option>-vc
-divx4</option> ????? ???? ????? ???????, ??? ???? ????????????? ????????.
-</para>
-
-<para>
-???????? ?????????? DivX4/5 ?????? ????? ???? ??????? ? ??????
-<ulink url="http://avifile.sourceforge.net">avifile</ulink> ???
-<ulink url="http://www.divx.com">divx.com</ulink>
-?????????? ???, ????????? ??? ????????????? <filename>./install.sh</filename>,
-? ?? ???????? ???????? 
-<filename class="directory">/usr/local/lib</filename> ? ???
-<filename>/etc/ld.so.conf</filename> ? ????????? <command>ldconfig</command>.
-</para>
-
-<para>
-??? ????? ???????? CVS ?????? ?????? ?????????? OpenDivX core:
-</para>
-
-<procedure>
-<step><para>
-<screen>cvs -d:pserver:anonymous at cvs.projectmayo.com:/cvsroot login</screen>
-</para></step>
-<step><para>
-<screen>cvs -d:pserver:anonymous at cvs.projectmayo.com:/cvsroot co divxcore</screen>
-</para></step>
-<step><para>
-???????? ?????????? ????????? ?? decore[???????] ? encore[?????] ??????????,
-??????? ?????? ??????????????? ??-???????????. ??? ?????????? decore, ?????? ????????
-<screen>
-cd divxcore/decore/build/linux
-make
-cp libdivxdecore.so /usr/local/lib
-ln -s libdivxdecore.so /usr/local/lib/libdivxdecore.so.0
-cp ../../src/decore.h /usr/local/include
-</screen>
-</para></step>
-<step><para>
-? ?????????, ??? ?????????? encore Linux'????? Makefile ???, ? MMX ????????????????
-??? ???????? ?????? ??? Windows. ?? ??? ?? ?????? ?????????????? ??, ????????? ????
-<ulink url="ftp://ftp.mplayerhq.hu/MPlayer/contrib/divx-mf/Makefile">Makefile</ulink>.
-<screen>
-cd ../../../encore/build
-mkdir linux
-cd linux
-cp path/Makefile .
-make
-cp libdivxencore.so /usr/local/lib
-ln -s libdivxencore.so /usr/local/lib/libdivxencore.so.0
-cp ../../src/encore.h /usr/local/include
-</screen>
-</para></step>
-</procedure>
-
-<para>
-<application>MPlayer</application> ????????????? ??????? DivX4/DivX5 ???? ??? ????
-????????? ??????????, ?????? ???????????? ??? ??????. ???? ?? ?? ??????? ????
-?????, ?? ?? ??????????? ?????????? ??? ???????????????? DivX4/DivX5.
-</para>
-
-</note>
-</para>
-</sect3>
-
-
 <sect3 id="ffmpeg" xreflabel="FFmpeg/libavcodec">
 <title>FFmpeg/libavcodec</title>
 
@@ -223,53 +107,20 @@
 ? <ulink url="http://www.ffmpeg.org/ffmpeg-doc.html#SEC20">?????</ulink> ??????.
 </para>
 
+
 <para>
-???? ?? ??????????? ????? <application>MPlayer</application>'?, ?? ? ??? ? ??????
-??? ???? <systemitem class="library">libavcodec</systemitem>,
-?????? ???????????? ??? ??????. ???? ?? ??????????? MPlayer
-?? CVS, ?? ?????? ??????? <systemitem class="library">libavcodec</systemitem>
-?? CVS ?????? FFmpeg, ????????? ?????? FFmpeg ????? ?????. ??? ???????, CVS
-?????????? ???????? ? ????????????? ?????? ????????????. ????? ??? ???????:
+Both <application>MPlayer</application> releases and
+<application>MPlayer</application> from Subversion contain
+<systemitem class="library">libavcodec</systemitem> so you don't have
+to care about making a separate <systemitem class="library">libavcodec</systemitem> checkout.
+Just run <filename>configure</filename> and compile.
 </para>
 
-<procedure>
-<step><para>
-  <screen>cvs -d:pserver:anonymous at mplayerhq.hu:/cvsroot/ffmpeg login</screen>
-  </para></step>
-<step><para>
-  <screen>cvs -z3 -d:pserver:anonymous at mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg</screen>
-  </para></step>
-<step><para>
-  ??????????? ??????? <filename>libavcodec</filename> ?? ????????? ???? FFmpeg
-  ? ?????? <application>MPlayer</application>'??????? CVS ??????.
-  ??? ?????? ????????? ???:
-  <filename class="directory">main/libavcodec</filename>
-  </para><para>
-  ????????????? ?????? <emphasis role="bold">??</emphasis> ??????????, ?? ??????
-  ???????????/??????????? ???!
-  </para></step>
-<step><para>
-  ???? ?? ??????, ????? <systemitem class="library">libavcodec</systemitem>
-  ??????????? ?????? ???, ????? ?? ??????????
-  <application>MPlayer</application>'?????? CVS, ???????? ????? ???????:
-  <filename>main/CVS/Entries</filename>
-  ? ???? <screen>D/libavcodec////</screen>
-  </para></step>
-<step><para>
-  ?????????????. <filename>configure</filename> ?????? ?????????? ???????? ??
-  ??????????.
-  </para></step>
-</procedure>
-
-<note>
 <para>
-<application>MPlayer</application> ?? CVS ???????? ??????????
-<filename>libavcodec</filename>, ?? ?? <emphasis role="bold">??</emphasis>
-???????? ???????? ??? ??? <systemitem class="library">libavcodec</systemitem>!
-?? ?????? ????????? ?????????,
-??????????? ????, ????? ???????? ???????? ??? ???? ??????????.
-</para>
-</note>
+??? ????? <application>MPlayer</application>'?, ??? ? ??? ?????? ?? Subversion 
+???????? <systemitem class="library">libavcodec</systemitem>. ??????? ??? ?????????? 
+???????????? ? ?? ????????? ??????. ?????? ????????? 
+<filename>configure</filename> ? ???????????? ??? ??????.
 
 <para>
 ? FFmpeg ? ???? Matrox G400, ? ???? ???? ???????? DivX ?????? ? ??????????
@@ -289,23 +140,28 @@
 <!--- XXX Find a better translation: However, the XAnim
 author has yet to bring legal action against anyone for codec-related issues.
 -->
-??? ?? ?????, ????? XAnim'? ??? ?????? ??? ?????????? ??????????? ???????? ??
+??? ?? ?????, ????? XAnim'? ??? ?????? ?????????? ??????????? ???????? ??
 ??????????? ? ??????? ????????.
+<!-- 
+Probably, this is better, but i do not sure:
+??? ?? ????? ????? ??? ?????? ???????? ???????? ??? ?????? ????-???? ?? ??????????? 
+? ?????? ????????.
+-->
 </para>
 </note>
 
 <formalpara>
 <title>????????? ? ?????????????</title>
 <para>
-<application>MPlayer</application> ??????? ???????????? XAnim'?????? ??????
+<application>MPlayer</application> ???????? ???????????? XAnim'?????? ??????
 ??? ?????????????. ????? ???????? ??, ???????? ???????????:
 </para>
 </formalpara>
 
 <procedure>
 <step><para>
-  ???????? ??????, ??????? ?? ?????? ????????????, ? ?????
-  <ulink url="http://xanim.va.pubnix.com">XAnim site</ulink>.
+  ???????? ??????, ??????? ?? ?????? ????????????, ? 
+  <ulink url="http://xanim.va.pubnix.com">????? XAnim</ulink>.
   <emphasis role="bold">3ivx</emphasis> ?????? ??? ???, ?? ??? ????? ????? ??
   <ulink url="http://www.3ivx.com">????? 3ivx</ulink>.
   </para></step>
@@ -326,7 +182,7 @@
   </para></step>
 <step><para>
   ????????????/???????? ????????????? ??????, ????? ?????, ??????????? ?
-  ??????????? ???, ????? ????? ?????????? ???: <filename>vid_cvid.xa</filename>,
+  ??????????? ???, ????? ????? ??????????: <filename>vid_cvid.xa</filename>,
   <filename>vid_h263.xa</filename>, <filename>vid_iv50.xa</filename>
   </para></step>
 </procedure>
@@ -338,7 +194,7 @@
 </para>
 
 <para>
-????????????? ?????? ???: <emphasis role="bold">Indeo 3.2, 4.1, 5.0, CVID, 3ivX,
+???????????????? ??????: <emphasis role="bold">Indeo 3.2, 4.1, 5.0, CVID, 3ivX,
 h263.</emphasis>
 </para>
 </sect3>
@@ -411,17 +267,7 @@
 ????? <option>--with-reallibdir</option>.
 </para>
 
-<para>
-?? Mac OS X ?? ?????? ?????????, ??? <filename>pncrt.Shlb</filename> (??????? ???
-resource fork!) ????????? ? ??? ?? ????????, ??? ? Real ??????. ?????????? ??,
-????????, ???: 
-<screen>ditto -rsrcFork "RealOne Player.app/Contents/MacOS/pncrt.Shlb" "RealOne Player.app/Contents/MacOS/Library/Codecs"</screen>
-???? ?? ????? ?? ????????, ??? ???????? ??????????? resource fork, ?? ??????
-???????? ????? ??????:
-<screen>GetDiskFragment() failed with error -2804: &lt;&lt;Unknown disk fragment&gt;&gt;&lt;&lt;Unknown disk fragment&gt;&gt;&lt;pncrt.Shlb&gt;&lt;&gt;</screen>
-</para>
 
-
 <note><para>
 <application>RealPlayer</application>'?????? ?????????? ? ????????? ??????
 <emphasis role="bold">???????? ?????? ??? Linux, FreeBSD, NetBSD ? Cygwin
@@ -435,46 +281,38 @@
 <title>XviD</title>
 
 <para>
-<ulink url="http://www.xvid.org">XviD</ulink> - ??? ??????????, ??????????????? ??
-OpenDivX ??????. ??? ?????????, ????? ProjectMayo ?????? ???????? ??? OpenDivX
+<ulink url="http://www.xvid.org">XviD</ulink> ?????????, MPEG-4 ASP ???????????
+????? ?????, ????????????? ???????? ????????? ????????????? ??????????? ?
+?????? ????????? MPEG-4 ASP, ???????? ??? ??????? ????? ????????????, ???
+?????? ????????? DivX. ?? ???????? ????? ????????? ???????? ? ???????
+???????????????????, ? ???? ??????????? ??? ??????????? ??????????? ???????????.
+</para>
+
+<para>
+?? ??????? ??? ??????????? OpenDivX ??????. ??? ?????????, ????? ProjectMayo 
+?????? ???????? ??? OpenDivX
 ???????? (DivX4, ?????? DivX5), ? ???????????? OpenDivX ?? ?? ProjectMayo
 ???????????, ? ??????? ?? XviD. ??????? ? ????? ???????? ????? ?????.
-
-<itemizedlist>
-<title>????????????</title>
-<listitem><simpara>
-  ???????? ???????? ???
-  </simpara></listitem>
-<listitem><simpara>
-  API ?????????? ? DivX4, ??????? ?????? ???????? ??? ???? ?????????
-  </simpara></listitem>
-<listitem><simpara>
-  ????????? ??????????? ? 2 ???????
-  </simpara></listitem>
-<listitem><simpara>
-  ??????? ???????? ???????????, ????? ??????? ????????, ?? ????????? ? DivX4
-  (?? ?????? ??? ?????????????? ??? ???? ?????? ?? ????? ??????????)
-  </simpara></listitem>
-</itemizedlist>
-
-<itemizedlist>
-<title>??????????</title>
-<listitem><simpara>
-  ? ????????? ?????? ?? ??? DivX/DivX4 ????? <emphasis role="bold">????????????
-  </emphasis> (?? ????????, ????????? ?? ????? ?????????????
-  <link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
-  </simpara></listitem>
-<listitem><simpara>
-  ?????????? ???????????? ? ? ????????? ??????
-  </simpara></listitem>
-</itemizedlist>
 </para>
 
 <procedure>
-<title>????????? XVID CVS</title>
+<title>????????? <systemitem class="library">XviD</systemitem></title>
+
 <para>
-  ? ????????? ?????? ?? ???????? ?????? ?? CVS. ??? ??? ??? ??????? ? ?????????
-  (??? ??????????? autoconf ?? ?????? 2.50, automake ? libtool):
+  ??? ? ??????????? ?? ? ???????? ???????? ?????, ?? ???????? ??? ? ???? 
+  <ulink url="http://www.xvid.org/downloads.html">??????????? ???????</ulink>,
+  ??? ? ? ???? CVS ??????. 
+<!-- FIXME need good translation 
+  The CVS version is usually stable enough to use, as most of the time it
+  features fixes for bugs that exist in releases.
+-->
+  ??? ??????? CVS ?????? ?????????? ????????? ??? ?????????????, ?.?. ? ???????????
+  ??????? ?? ???????????? ???????? ?????????? ??????, ?????????????? ? ???????.
+  ????? ??????????? ??? ?????????  ????????
+  <systemitem class="library">XviD</systemitem> CVS ? <application>MEncoder</application>'??
+  (??????????, ??? ???????,
+  <application>autoconf</application> 2.50,
+  <application>automake</application> ? <application>libtool</application>):
 </para>
 <step><para>
   <screen>cvs -z3 -d:pserver:anonymous at cvs.xvid.org:/xvid login</screen>
@@ -522,13 +360,13 @@
 
 <itemizedlist>
 <listitem><simpara>
-  Sorenson 1 (fourcc <emphasis>SVQ1</emphasis>) - ????????????? ??????????????
+  Sorenson Video v1 (fourcc <emphasis>SVQ1</emphasis>) - ????????????? ??????????????
   <emphasis role="bold">?????? ???????</emphasis>
   (<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
   </simpara></listitem>
 <listitem><simpara>
-  Sorenson 3 (fourcc <emphasis>SVQ3</emphasis>) - ????????????? ??????????????,
-  ????????? <emphasis role="bold">"??????" ?????</emphasis>
+  Sorenson Video v3 (fourcc <emphasis>SVQ3</emphasis>) - ????????????? ??????????????
+  <emphasis role="bold">?????? ???????</emphasis>
   (<link linkend="ffmpeg"><systemitem class="library">libavcodec</systemitem></link>)
   </simpara></listitem>
 </itemizedlist>
@@ -537,7 +375,7 @@
 <title>?????????? MPLAYER'? ? ?????????? ????????? QUICKTIME</title>
 <note><para>? ????????? ?????? ?????????????? ?????? 32?????? Intel'??????
 ?????????.</para></note>
-<step><para>???????? <application>MPlayer</application>'?????? CVS</para></step>
+<step><para>???????? <application>MPlayer</application>'?????? Subversion</para></step>
 <step><para>???????? ????? QuickTime DLL ?
 <ulink url="http://www.mplayerhq.hu/MPlayer/releases/codecs/"/>
 </para></step>
@@ -553,141 +391,133 @@
 <title>x264</title>
 
 <sect4 id="codec-x264-whatis">
-<title>What is x264?</title>
+<title>??? ????? x264?</title>
 <para>
-  <systemitem class="library">x264</systemitem> is a library for
-  creating H.264 video streams.
-  It is not 100% complete, but currently it has at least some kind
-  of support for most of the H.264 features which impact quality.
+  <systemitem class="library">x264</systemitem> ??? ?????????? ??? ????????
+  ???????????? H.264. ??? ?? ????????? ?? 100%, ?? ??? ????? ???????????
+  ???????? ????????? ??????????? ???????????? H.264.
+<!-- FIXME need better translation 
   There are also many advanced features in the H.264 specification
   which have nothing to do with video quality per se; many of these
-  are not yet implemented in
-  <systemitem class="library">x264</systemitem>.
+-->
+  ? ???????????? H.264 ???????????? ????????? ?????????????? ????????????,
+  ??????? ????? ?? ?????? ?? ???????? ????? ? ?? ??? ? 
+  <systemitem class="library">x264</systemitem> ?? ???????????.
 </para>
 
 <itemizedlist>
-<title>Encoder features</title>
+<title>??????????? ??????</title>
+<!-- FIXME i can't translate this -->
   <listitem><para>CAVLC/CABAC</para></listitem>
   <listitem><para>Multi-references</para></listitem>
-  <listitem><para>Intra: all macroblock types (16x16 and 4x4 with
+  <listitem><para>Intra: all macroblock types (16x16, 8x8, and 4x4 with
     all predictions)</para></listitem>
   <listitem><para>Inter P: all partitions (from 16x16 down to
     4x4)</para></listitem>
   <listitem><para>Inter B: partitions from 16x16 down to 8x8
     (including SKIP/DIRECT)</para></listitem>
   <listitem><para>Ratecontrol: constant quantizer, constant bitrate,
-    or multipass ABR</para></listitem>
+    single or multipass ABR, optional VBV</para></listitem>
   <listitem><para>Scene cut detection</para></listitem>
   <listitem><para>Adaptive B-frame placement</para></listitem>
   <listitem><para>B-frames as references / arbitrary frame
     order</para></listitem>
+  <listitem><para>8x8 and 4x4 adaptive spatial transform</para></listitem>
+  <listitem><para>Lossless mode</para></listitem>
+  <listitem><para>Custom quantization matrices</para></listitem>
+  <listitem><para>Parallel encoding of multiple slices</para></listitem>
 </itemizedlist>
 
-<itemizedlist>
-<title>Encoder limitations</title>
-  <listitem><para>No real RD</para></listitem>
-</itemizedlist>
-
-
 </sect4>
 
 <sect4 id="codec-h264-whatis">
-<title>What is H.264?</title>
+<title>??? ????? H.264?</title>
 <para>
-  H.264 is one name for a new digital video codec jointly developed
-  by the ITU and MPEG.
-  It can also be correctly referred to by the cumbersome names of
-  "ISO/IEC 14496-10" or "MPEG-4 Part 10".
-  More frequently, it is referred to as "MPEG-4 AVC" or just "AVC".
+  
+  H.264 ??? ???? ?? ???????? ?????? ????????? ?????? ????????? 
+  ???????????????? ITU ? MPEG. ???????? "ISO/IEC 14496-10" ???
+  "MPEG-4 Part 10" ???? ???????? ???????????, ?? ???? ???
+  ????????  "MPEG-4 AVC" ??? ?????? "AVC".
 </para>
 <para>
-  Whatever you call it, H.264 may be worth trying because it can
-  typically match the quality of MPEG-4 ASP with 5%-30% less
-  bitrate.
-  Actual results will depend on both the source material and the
-  encoder.
-  The gains from using H.264 do not come for free: decoding H.264
-  streams seems to have steep CPU and memory requirements.
-  For instance, on a 1733 MHz Athlon, a 1500kbps H.264 video uses
-  around 50% CPU to decode.
-  By comparison, decoding a 1500kbps MPEG4-ASP stream requires
-  around 10% CPU.
-  This means that decoding high-definition streams is almost out of
-  the question for most users.
-  It also means that even a decent DVD rip may sometimes stutter on
-  processors slower than 2.0 GHz or so.
+  ??? ??? ?? ???????, ?? H.264 ????? ???????????, ????????? ?? 
+  ???? ?? ?? ????????, ??? ? MPEG-4 ASP, ?? ??? ???????? ??????? 
+  ?? 5%-30%. ?????????? ????????? ??????? ??? ?? ?????????
+  ?????????, ??? ? ?? ???????????. ??????? ?? ?????? ?????? ???:
+  ????????????? ?????? H.264, ??????, ????? ?????????? ??????????
+  ? CPU ? ??????. ? ?????????, ?? 1733 MHz Athlon ?????????????
+  H.264 ?????? ? 1500????/? ? DVD-???????????  ?????????? ????? 50% CPU.
+  ??? ?????????, ????????????? 1500????/? ?????? MPEG4-ASP ? 
+  DVD-??????????? ??????? ????? 10% CPU. ??? ??????, ??? ?????? ????????????? 
+  ??????? ???????? ?????????? ?? ????? ????? ???????????? ?????????????.
+  ????? ??? ??????, ??? ???? ???????? DVD ??? ????? ????? ?? ???????
+  ????????? ?? ??????????? ?????? 2.0 GHz ??? ????? ????.
 </para>
 <para>
-  At least with <systemitem class="library">x264</systemitem>,
-  encoding requirements are not much worse than what you are used to
-  with MPEG4-ASP.
-  For instance, on a 1733 MHz Athlon a typical DVD encode would run
-  at 5-15fps.
+  ??? ??????? ? <systemitem class="library">x264</systemitem>,
+  ?????????? ??? ??????????? ?? ??????? ?????? ?? ????????? ? MPEG4-ASP.
+  ? ?????????, ?? 1733 MHz Athlon ??????????? ???????? DVD ????? ???? ??
+  ????????? 5-15 fps.
 </para>
 <para>
-  This document is not intended to explain the details of H.264,
-  but if you are interested in a brief overview, you may want to read
+  ????????? ??? ???????? H.264 ?? ???????? ????? ????? ?????????, ?? ????
+  ??? ?????????? ??????? ?????, ?? ?????? ???????? 
   <ulink url="http://www.cdt.luth.se/~peppar/kurs/smd151/spie04-h264OverviewPaper.pdf">The H.264/AVC Advanced Video Coding Standard: Overview and Introduction to the Fidelity Range Extensions</ulink>.
 </para>
 </sect4>
 
 <sect4 id="codec-x264-playback">
-<title>How can I play H.264 videos with <application>MPlayer</application>?</title>
+<title>??? ??? ?????????? H.264 ??? ?????? <application>MPlayer</application>?</title>
 <para>
-  <application>MPlayer</application> uses
-  <systemitem class="library">libavcodec</systemitem>'s H.264
-  decoder.
-  <systemitem class="library">libavcodec</systemitem> has had at
-  least minimally usable H.264 decoding since around July 2004,
-  however major changes and improvements have been implemented since
-  that time, both in terms of more functionalities supported and in
-  terms of improved CPU usage.
-  Just to be certain, it is always a good idea to use a recent CVS
-  checkout.
+  <application>MPlayer</application> ?????????? H.264 ??????? ??????????
+  <systemitem class="library">libavcodec</systemitem>.
+  <systemitem class="library">libavcodec</systemitem> ???????? ????-???????
+  ????????? ??? ????????????? ??????????? ????????????? H.264 ???-?? ? ???? 2004,
+  ??????? ? ???? ??????? ???? ??????? ???????? ????????? ????????? ? ?????????,
+  ??? ? ????? ?????? ?????????????? ?????????????? ????????????, ??? ? ???????????
+  ????????????? CPU.
+  ??? ??????????????: ????????????? ??????? ????? CVS - ?????? ??????? ????.
 </para>
 <para>
-  If you want a quick and easy way to know whether there have been
-  recent changes to <systemitem class="library">libavcodec</systemitem>'s
-  H.264 decoding, you might keep an eye on 
-  <ulink url="http://mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/h264.c?cvsroot=FFMpeg">FFmpeg CVS repository's web interface</ulink>.
+  ???? ????? ??????? ? ??????? ?????? ????? ?????? ?????????, ??????????? ? H.264,
+  ???? ??????? ? <systemitem class="library">libavcodec</systemitem>, ??? ???????
+  ????? ?????
+  <ulink url="http://mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/h264.c?cvsroot=FFMpeg">FFmpeg CVS repository's web interface (???-????????? ? ??????????? FFmpegCVS)</ulink>.
 </para>
 </sect4>
 
 <sect4 id="codec-x264-encode">
-<title>How can I encode videos using <application>MEncoder</application> and <systemitem class="library">x264</systemitem>?</title>
+<title>??? ?????????? ?????, ????????? <application>MEncoder</application> ? <systemitem class="library">x264</systemitem>?</title>
 <para>
-  If you have the subversion client installed, the latest x264
-  sources can be gotten with this command:
+  ???? ? ??? ?????????? ?????? subversion, ????????? ?????? x264 
+  ????? ????????? ????????? ????????:
   <screen>
-    svn co svn://svn.videolan.org/x264/trunk x264
-  </screen>
-  <application>MPlayer</application> sources are updated whenever
-  an <systemitem class="library">x264</systemitem> API change
-  occurs, so it is always suggested to use CVS
-  <application>MPlayer</application> as well.
-  Perhaps this situation will change when and if an
-  <systemitem class="library">x264</systemitem> "release" occurs.
-  Meanwhile, <systemitem class="library">x264</systemitem> should
-  be considered very unstable, in the sense that its programming
-  interface is subject to change.
+    svn co svn://svn.videolan.org/x264/trunk x264<!--
+--></screen>
+  ???????? ??? <application>MPlayer</application> ??????????? 
+  ?????? ??? ??? ????????? API <systemitem class="library">x264</systemitem>, 
+  ??? ??? ???????????? ???????????? Subversion ??????
+  <application>MPlayer</application>'?.
+  ????????, ???????? ????????? ? ??????? "??????" 
+  <systemitem class="library">x264</systemitem> (???? ?? ?????).
+  ? ?????? ?????? <systemitem class="library">x264</systemitem> ???????
+  ????????????? ??? ????? ????????????, ? ????? ??????????? ?????????
+  ?????????? ????????????????.
 </para>
 <para>
-  <systemitem class="library">x264</systemitem> is built and
-  installed in the standard way:
+  <systemitem class="library">x264</systemitem> ?????????? ? ???????????????
+  ??? ??????:
   <screen>
     ./configure &amp;&amp; make &amp;&amp; sudo make install
   </screen>
-  This installs libx264.a in /usr/local/lib and x264.h is placed in
-  /usr/local/include.
-
-  With the <systemitem class="library">x264</systemitem> library
-  and header placed in the standard locations, building
-  <application>MPlayer</application> with
-  <systemitem class="library">x264</systemitem> support is easy.
-  Just run the standard:
+  ??? ????????? libx264.a ? /usr/local/lib, ? x264.h - ? /usr/local/include.
+  ?????? <application>MPlayer</application>'? ??? ????????????? ? ???????????
+  ???????? ?????????? ? ????????????? ????? <systemitem class="library">x264</systemitem>
+  ????? ??????.
+  ?????? ????????? ??????????:
   <screen>./configure &amp;&amp; make &amp;&amp; sudo make install</screen>
-  The configure script will autodetect that you have satisfied the
-  requirements for <systemitem class="library">x264</systemitem>.
+  ?????? configure ??? ?????????, ????????? ?? ??????????? ?????????? ???
+  <systemitem class="library">x264</systemitem>.
 </para>
 </sect4>
 </sect3>
@@ -740,6 +570,9 @@
   alaw ? ulaw, ????????? gsm, adpcm ? pcm ??????? ? ?????? ??????? ?????? ?????
   ??????
   </simpara></listitem>
+<listitem><simpara>
+  Adaptive Multi-Rate (AMR) ??????? ??????
+  </simpara></listitem>
 </itemizedlist>
 
 
@@ -803,7 +636,9 @@
 <ulink url="http://mad.sourceforge.net">libmad</ulink> - ??? ??????????????????,
 ????????????? (????????? 24'?????? PCM)
 ?????????? ????????????? MPEG ?????. ??? ?? ????? ?????? ???????????? ?????
-????? ? ?????? ? ??? ?????? ???????? ? ???????????? ?? ?????.
+????? ? ?????? ? ??? ?????? ???????? ? ???????????? ?? ?????, ??? 
+????? ???? ???????????????? mp3lib ?? ?????????? ??? FPU
+(????? ??? <link linkend="arm">ARM</link>).
 </para>
 
 <para>
@@ -813,11 +648,22 @@
 </sect3>
 
 
+<sect3 id="hwmpa">
+<title>?????????? MPEG ????? ?????</title>
+
+<para>
+???? ????? (?????????? ?? -ac hwmpa) ???????? ??? ????? ?????? MPEG ??????????
+?????????, ?????, ??? ????????????? ? ??????????????????? DVB ?????? ? DXR2 ?????????.
+?? ??????????? ??? ? ??????? ?????????? ?????? ????? (?????? ??? OSS ? ALSA), ???????
+?? ???????? ????????? ???????????? (?? ??????? ?????? ????? ???).
+</para>
+</sect3>
+
 <sect3 id="vivo-audio">
 <title>VIVO ?????</title>
 <para>
-????? ?????, ???????????? ? VIVI ?????? ??????? ?? ????, ??? VIVI/1.0 ???
-VIVI/2.0 ????. ? VIVO/1.0 ?????? <emphasis role="bold">g.723</emphasis> ?????,
+????? ?????, ???????????? ? VIVO ?????? ??????? ?? ????, ??? VIVO/1.0 ???
+VIVO/2.0 ????. ? VIVO/1.0 ?????? <emphasis role="bold">g.723</emphasis> ?????,
 ? ? VIVO/2.0 ?????? - <emphasis role="bold">Vivo Siren</emphasis> ?????. ???
 ???? ??????????????.
 </para>
@@ -875,7 +721,7 @@
 AAC (Advanced Audio Coding) - ??? ?????, ?????? ?????????????? ? MOV ? MP4
 ??????. ??????? ? ???????? ???????? ?????, ?????????? FAAD, ???????? ?
 <ulink url="http://www.audiocoding.com"/>.
-<application>MPlayer</application> ???????? ? ???? libfaad 2.0RC1, ???????
+<application>MPlayer</application> ???????? ? ???? CVS ???? libfaad 2.1 beta, ???????
 ??? ?????? ?? ????? ????????????? ?????????.
 </para>
 
@@ -888,22 +734,52 @@
 ??? ??? ?? ?????? ?? ???????:
 <screen>
 cd faad2/
-chmod +x bootstrap
-./bootstrap
+sh bootstrap
 ./configure
 cd libfaad
 make
 make install
 </screen>
-??????? ??????????? ?? audiocoding.com, ?? ?? ?????? ??????? (apt-get) Debian
+????????? ??????????? ?? audiocoding.com, ?? ?? ?????? ??????? (apt-get) Debian
 ?????? ? <ulink url="http://marillat.free.fr">???????? ???????? Christian Marillat</ulink>,
 Mandrake RPM'???? ? <ulink url="http://plf.zarb.org">P.L.F</ulink> ? RedHat RPM'????
 ? <ulink url="http://greysector.rangers.eu.org/">Grey Sector[????? ??????]</ulink>.
 </para>
 </sect3>
 
+<sect3 id="amr">
+<title>AMR ??????</title>
+<para>
+Adaptive Multi-Rate ??????? ????? ???????????? ? ????????? ????????? ???????? ????????? (3G).
+
+??????????? ??????????? (reference implementation) ???????? ? 
+<ulink url="http://www.3gpp.org">The 3rd Generation Partnership Project</ulink>
+(????????? ??? ?????? ?????????????).
+</para>
+<para>
+????? ???????? ?????????, ???????? ????????? ???
+<ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-6/26_series/26104-610.zip">AMR-NB</ulink>
+?
+<ulink url="http://www.3gpp.org/ftp/Specs/latest/Rel-6/26_series/26204-600.zip">AMR-WB</ulink>
+???????, ????????? ?? ? ???????, ??? ??????????? ????????? 
+<application>MPlayer</application> ? ????????? ????????? ???????:
+<screen>
+unzip 26104-610.zip
+unzip 26104-610_ANSI_C_source_code.zip
+mv c-code libavcodec/amr_float
+unzip 26204-600.zip
+unzip 26204-600_ANSI-C_source_code.zip
+mv c-code libavcodec/amrwb_float
+</screen>
+????? ????? ???????? ??????? <link linkend="features">????????? ??????</link>
+<application>MPlayer</application>.
+
+</para>
+</sect3>
+
 </sect2>
 
+
 <!-- ********** -->
 
 <sect2 id="codec-importing">
@@ -1012,7 +888,7 @@
 <procedure>
 <title>?????? ?????:</title>
 <para>
-???????? ???????? ???? ? ??????? ?????? ? ????????...
+???????? ???????? ???? ? ??????? ?????? ? ???????...
 </para>
 <step><para>
   ????????? <command>regedit</command>.
@@ -1056,6 +932,10 @@
 role="url">ftp://upload.mplayerhq.hu/MPlayer/incoming/[codecname]/
 </systemitem>
 </para>
+<para>
+???? ?? ?????? ???????? ????? ??????????????, ????????
+<ulink url="http://www.mplayerhq.hu/MPlayer/DOCS/tech/codecs.conf.txt">DOCS/tech/codecs.conf.txt</ulink>.
+</para>
 </sect3>
 </sect2>
 </sect1>
Index: cd-dvd.xml
===================================================================
--- cd-dvd.xml	(revision 19668)
+++ cd-dvd.xml	(working copy)
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!-- synced with 1.11 -->
+<!-- synced with r18426 -->
 <chapter id="cd-dvd">
 <title>????????????? CD/DVD</title>
 
 <sect1 id="drives">
 <title>??????? CD/DVD</title>
-<para>
-?? Linux'?????? ????????????:
-</para>
 
 <para>
 ??????????? ??????? CD-ROM ????? ???????? ?? ?????  ??????? ?????????, ?????????
@@ -18,8 +15,8 @@
 <itemizedlist>
 <listitem><para>
 ?? ??????? ???????? ?????????? ??????????? ?????? ??? ??????, ???????? ?
-????? ???????????? ??????. ?????????? ???????? ????? ????????????? ??????
-?????? ? ????????? ???????.
+????? ???????????? ??????. ?????????? ???????? ????? ????????????? ??????
+?????? ? ???? ??????.
 </para></listitem>
 
 <listitem><para>
@@ -28,21 +25,30 @@
 </para></listitem>
 </itemizedlist>
 
+<sect2 id="drives_linux">
+<title>Linux</title>
+
 <para>
 ?? ?????? ????????? ???????? ???????? IDE CD-ROM ???????? ???????????
 <command>hdparm</command> ??? <command>setcd</command>. ??? ???????? ???:
 <screen>hdparm -E <replaceable>[????????]</replaceable> <replaceable>[cdrom ??????????]</replaceable></screen>
 <screen>setcd -x <replaceable>[????????]</replaceable> <replaceable>[cdrom ??????????]</replaceable></screen>
+<screen>cdctl -bS <replaceable>[speed]</replaceable></screen>
 </para>
 
 <para>
+???? ???????????? ???????? SCSI, ??? ??????? ????????? ????????? ? ????????? IDE
+??????????, ? ?? ??????????????? SCSI.
+</para>
+
+<para>
 ???? ? ??? ???? ?????????? ??????????????, ????????? ???????
 ???? ????? ????????? ????????:
 <screen>echo file_readahead:2000000 &gt; /proc/ide/<replaceable>[cdrom device]</replaceable>/settings</screen>
 </para>
 
 <para>
-????? ??????? ?????????????? ??????????? 2 ????????? (??????? ???
+????? ???????, ?????????????? ??????????? 2 ????????? (??????? ???
 ?????? ? ??????????). ???? ????????? ??????? ??????? ????????, ?? ??????????
 ?????? ? ????????? ???????? ????? ?????? ?????? ?????????????.
 ????????????? ????? ?????????? ??????, ????????? <command>hdparm</command>:
@@ -50,7 +56,7 @@
 </para>
 
 <para>
-????? ??????? ?????????? ?????? ?????? ? ??????[DMA], ???????????????
+???? ???????? ?????????? ?????? ?????? ? ??????[DMA], ???????????????
 ?????? ? ????????????? IRQ (???????? man-???????? <command>hdparm</command>,
 ? ????? ????????? ?????????).
 </para>
@@ -67,8 +73,9 @@
 </para>
 
 <para>FreeBSD:</para>
-<para>????????: <command>cdcontrol [-f <replaceable>device</replaceable>] speed <replaceable>speed</replaceable></command></para>
-<para>DMA: <command>sysctl hw.ata.atapi_dma=1</command></para>
+<para>????????: 
+<screen>cdcontrol [-f <replaceable>device</replaceable>] speed <replaceable>speed</replaceable></screen></para>
+<para>DMA: <screen>sysctl hw.ata.atapi_dma=1</screen></para>
 </sect1>
 
 <sect1 id="dvd">
@@ -117,7 +124,8 @@
 
 <note><para>
 ? ?????? ??????? ? ?????????????? DVD, ?????????? ????????? supermount ???
-?????? ???????? ????????.
+?????? ???????? ????????. ????????? RPC-2 ?????????? ????? ????????? 
+?c??????? ???? ???????.
 </para></note>
 
 <formalpara>
@@ -126,8 +134,8 @@
 ????? DVD ?????????? ??????? ???????? ? 2048 ?????? ? ECC/CRC. ?? ??? ??????
 ???????????? ???????? ??????? UDF ?? ????? ???????, ??????? ????????
 ????????? ????? (??????????? .IFO ? .BUK ? ??????? (??????? ?????????)
-.VOB). ??? ????????? ?????, ??????? ????? ?????????????/???????????? ?
-???????????????? ?? ?????????????? DVD.
+.VOB). ??? ????????? ?????, ??????? ????? ?????????????/???????????? ??
+??????????????? ?? ?????????????? DVD.
 </para>
 </formalpara>
 
@@ -142,31 +150,31 @@
 <para>
 ??? ????????? DVD ????????? ?????? ??????????? ?????? ? ??????????. ? ?????????,
 (??? Linux) ?? ?????? ???? root'??, ????? ???????? ????????? ????? ?????.
-??????? ?? ?????? ?? ?????????? ??????? ???????? ??????? ?? ????, ?
-???????????? ??? ??? ?????????? ? ????????????????? ????????????.
+??? ?????? ?? ?????? ?? ?????????? ??????? ???????? ??????? ?? ????, ?
+?????????? ??? ??? ?????????? ? ????????????????? ????????????.
 <systemitem>libdvdread</systemitem> 0.9.x ? <systemitem>
 libmpdvdkit</systemitem> ??? ? ??????. ??????? UDF
-???????? ??????? ?? ?????, ????????? ? ???? ??????????? ???? ??????????
-???????? ???????? ???????
-UDF. ????? DVD ?? ?????? ???? ???????????????, ????????? ????????????
+???????? ??????? ?? ?????, ????????? ??????????????? ???????? ???????? ? ??? ??????????. 
+DVD ????? ?? ?????? ???? ??????????????, ????????? ????????????
 ?????? ?????? ??????????? ??????.
 </para>
 
 <para>
-?????? ???????????? ?? ????? ?????? <filename>/dev/dvd</filename>,
-??????? ?????? <systemitem>libdvdread</systemitem> ???????? ????????????
-???????, ??????? ?????????? ????????? ?????? ? ???????? ????? ? ????????,
+?????? <filename>/dev/dvd</filename> ?? ???????? ?? ?????? ??????? ?????????????,
+??????? ?????? <systemitem>libdvdread</systemitem> ????????
+??????? ????????, ??????? ?????????? ????????? ?????? ? ???????? ????? ? ????????,
 ??? ???????? ??????? ??????? ?? ??????????????? ???????? ??????? ??? ?? ???????
 ?????.
 </para>
 
 <para>
-<systemitem>libdvdread</systemitem> ???? ????????? ????? ???????????? ??????
+<systemitem>libdvdread</systemitem> ???? ????????? ????????? ????? ???????????? ??????
 ????? ?????????? ??? ??????? ???????, ? ???????? ??? ???????? ?? <filename>
-/proc/mounts</filename>. ???? ????? ???????? ??? Solaris-??, ??? ?????? ????????
+/proc/mounts</filename>. ???? ????? ???????? ??? Solaris, ??? ?????? ????????
 ????????????? ???????????.
 </para>
 
+<!--FIXME duplicate paragraph -->
 <para>
 ?????????? DVD ?? ????????? &mdash; <filename>/dev/dvd</filename>. ???? ????
 ????????? ??????????, ???????? ????????????? ?????? ??? ??????? ??????????
@@ -176,10 +184,10 @@
 <formalpara>
 <title>DVD ??????????????</title>
 <para>
-?????????????? ? ?????????? ? ????? ?????? ????????? DVD ??????????, ?????????
-???????????? <systemitem>libdvdcss</systemitem> (??. ????). ????? ????? ????
+?????????????? ? ?????????? ? ????? ?????? ????????? DVD ?????????? ??? ??????
+???????????? <systemitem>libdvdcss</systemitem> (??. ????). ????? ????? ????
 ?????? ? ?????????? ????? <envar>DVDCSS_METHOD</envar>, ??????? ????? ????
-??????????? ? key, disk or title.
+??????????? ? key, disk ??? title.
 </para>
 </formalpara>
 
@@ -222,8 +230,8 @@
 <application>MPlayer</application> ??????????? ????????????? ????? ???????,
 ??????? ????????? ? <emphasis>??????? ????????</emphasis>, ????????? 
 <systemitem>ioctl()</systemitem>. ???????????? ?????? RPC-2 ????????
-?????????????? ?????? ?? ???? ?????; ????? ?? ????????? ?? ???????? ????????.
-???? ???????, ????? ??????? ????? ????????????, ????????? ????? ????? ? ????.
+?????????????? ?????? ?? ???? ????? ? ????? ?? ????????? ?? ???????? ????????.
+???? ??? ???????, ????? ??????? ????? ????????????, ????????? ????? ????? ? ????.
 </para></listitem>
 
 <listitem><para>
@@ -270,14 +278,14 @@
 <note><para>
 ?? ??????? ???? Plextor'? ? ????????? Toshiba SCSI CD-ROM ??????? ??????????
 ??????? ?????????????????? ??? ?????? VCD'??. ??? ??????????? ???, ???
-CDROMREADRAW <systemitem>ioctl</systemitem> ?? ???? ???????? ??????????? ?? ???????.
+CDROMREADRAW <systemitem>ioctl</systemitem> ?? ???? ???????? ?????????? ?? ?????????.
 ???? ?? ?????? ????????? ???????? ? ????? ???????????????? SCSI, ??????????
 <ulink url="../../tech/patches.txt">???????? ???</ulink> ? ????????? ?????????
 SCSI generic ??? VCD.
 </para></note>
 
 <para>
-? ????????? ?????? ?? ?????? ??????? ?????? ? VCD'??, ????????? 
+? ????????? ?????? ?? ?????? ??????? ?????? ? VCD, ????????? 
 <ulink url="http://140.132.1.204/OS/Linux/packages/X/viewers/readvcd/">
 readvcd</ulink>, ? ????????????? ???????????? ???? <application>MPlayer
 </application>'??.
@@ -286,30 +294,45 @@
 <formalpara>
 <title>????????? VCD</title>
 <para>
-????? VCD ??????? ?? ????? ??? ?????????? ???????:
+VCD ????????? ?? ???????? CD-ROM XA, ?.?. ??????? CD-ROM mode 2 form 1 ? form 2:
 </para>
 </formalpara>
 
 <itemizedlist>
 <listitem><para>
-?????? ??????? ???????? ????????? ???????? ????????? ?? 2048 ??????,
-? ???????? ???????? iso9660, ?????? ?????????? ????????????? VCD ???
-Windows ?, ????????, ?????? ??????????, ????? ???????? ??? ??????.
+?????? ??????? ???????? ? mode 2 form 2 ???????, ???, ? ?????????, ????????
+????????????? ????????? ?????? L2. ??????? ???????? ???????? ??????? ISO-9660 ?
+????????? ?? 2048 ????. ??? ?????????? ?????????? VCD, 
+? ????????, ????? ?????????????? ? ????. ????? ????? ????? ?????????
+????????? MPEG ??? ????, ?? ?????? ?? ??? ?????? ???? ?????? ?? ??????? ?? 
+150 ????????. ??? ???????? ??????? ????? ??????? ????? ??? ?????????,
+?? ??????? ????????? ? ?????? ? VCD.
 </para></listitem>
 
 <listitem><para>
 ?????? ? ????????? ??????? ???????? MPEG-????? ????????? ?? 2324 ?????, ??
-?????? ?????? MPEG PS ?? ?????? ?????? ???????? ???????. ??? ? ???????
-?????CD, ??? ??????? <emphasis role="bold">?? ???????????</emphasis>
+?????? ?????? MPEG PS ?? ?????? ?????? ???????? ???????. ??? ??????? ? ??????? 
+mode 2 form 1 ? ??????? ?????? ?????????? ?? ???? ?????? ?? ???? ?????? ???????????
+????????? ????????? ??????. ????? ?????? ??????? ????? ????????? ??????????? 
+??????? CD-DA. ? ????????? ?? ???????????? ????????? ?????, ????? ???????  ???
+??-ISO-9660 ??????? ????????  ? ???????? ???????. ?? Linux - ??? ?? ??? ?????? (????).
+????? MPEG ?????? <emphasis role="bold">?? ????? ???? ????????????</emphasis>. 
 (?? ?????-?????? ??????????? ????? ????
-??? ????, ????? ??? ??????????????) ??? ??? ??????????? ??????? ?????? ?? ????
-???????, ?????????? ??????? <option>vcd://2</option>.
+??? ????, ????? ??? ??????????????) ??? ??? ??????????? ??????? ????????? ?????? ?? 
+????? ????????, ?????????? ??????? <option>vcd://2</option>.
 </para></listitem>
 
 <listitem><para>
 ?????????? VCD ????? ??? ?????? ??????? (???????????? ??????? ??? ????????
-???????). ??? ???????????????, ?? ?? ???????????.
+???????). ??? ?????????????, ?? ?? ???????????.
 </para></listitem>
+
+<listitem><para> ???????? ????????? Video CD ?????????? 
+Philips "White Book" ?, ??? ???????, ?????????? ? ??????, ?.?. ????? ?????????????
+? Philips. ????? ????????? ?????????? ? Video CD ????? ???? ??????? ? 
+<ulink url="http://www.vcdimager.org/pub/vcdimager/manuals/0.7/vcdimager.html#SEC4">vcdimager documentation</ulink>.
+</para></listitem>
+
 </itemizedlist>
 
 <formalpara>
Index: history.xml
===================================================================
--- history.xml	(revision 19668)
+++ history.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
-<!-- synced with 1.11 -->
+<!-- synced with r14024 -->
 <!-- FIXME: history really should be in the appendix -->
 <sect1 id="history">
 <title>???????</title>
@@ -21,8 +21,8 @@
 <application>xmps</application>, <application>dvdview</application>, <application>
 livid/oms</application>, <application>videolan</application>, <application>xine
 </application>, <application>xanim</application>, <application>avifile</application>,
-<application>xmmp) ?? ? ??? ? ???? ???? ?????-?????? ????????.</application>
-?? ??????? ????? ?? ???????????? ??????? ??? ?????.????? ??????????????.
+<application>xmmp), ?? ? ??? ? ???? ???? ?????-?????? ????????.</application>
+?? ??????? ????? ?? ???????????? ??????? ??? ?????/????? ??????????????.
 ??????????? ?? ??? ???? ?? ???????? ??????????? ??? MPEG1, MPEG2, ??? ? AVI
 (DivX) ?????. ? ?????? ??????? ???? ???????? ? ????????? ??????????? ???
 ?? ?????????. ??????? ? ????? ????????/?????????????? ????...]
Index: documentation.xml
===================================================================
--- documentation.xml	(revision 19668)
+++ documentation.xml	(working copy)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="KOI8-R"?>
-<!-- synced with 1.17 -->
+<!-- synced with r19620 -->
 
 <bookinfo id="toc">
 <title><application>MPlayer</application> - The Movie Player</title>
@@ -40,14 +40,15 @@
 <title>??? ?????? ??? ????????????</title>
 
 <para>
-???? ?? ????????????? ? ?????? ???, ?????????? ??? ?? ????? ?????? ?????????
-? ?????????????? ??????, ??????? ?? ??????????. ???? ? ??? ??? ??? ????????
-???????, ????????? ? <link linkend="toc">??????????</link> ? ??????? ??? ??
-??? ????, ???????? <xref linkend="faq"/>, ??? ??????????? ???'grep'???? ?????.
+???? ?? ????????????? ????????? ? ?????? ???, ?????????? ??? ?? ?????? ?? ????? 
+? ?????? "?????????", ? ?????????????? ??????, ??????? ?? ??????????. 
+???? ? ??? ??? ??? ????????
+???????, ????????? ? <link linkend="toc">??????????</link> ? ??????? ???, 
+???????? <xref linkend="faq"/>, ??? ??????????? ???'grep'???? ?????.
 ?? ??????? ????? ???????? ?? ??????? ?????? ?????, ? ?????????, ????????, ???
 ???????????? ? ????? <link linkend="mailinglists">?????????</link>. ?????????
-<ulink url="http://www.mplayerhq.hu/cgi-bin/s-arch.cgi">?? ???????</ulink>, ???
-????? ????? ????? ?????? ??????????.
+<ulink url="http://www.mplayerhq.hu/cgi-bin/s-arch.cgi">?? ???????</ulink>, ?
+??????? ????? ????? ????? ?????? ??????????.
 </para>
 </preface>
 
@@ -82,13 +83,14 @@
 
 <para>
 ????? ??? ??????? ??????????? ???????????? MPEG ????? (??????? ??? ????????? VCD),
-? ?? ??????????? ?????? AVI ?????, ??????? ?? ????????????? ????????? 
-windows media player. ???? AVI ????? ??? ??????? ???????? ??????????????, ?
+?????? AVI ?????, ??????? ?? ????????????? ????????? 
+windows media player. ???? AVI ????? ??? ??????? ???????? ??????????????.
 ?? ?????? ???????? ??????? ?????? ? ??????? ????? <option>-idx</option>, ???
 ??????????? ? ??????? <application>MEncoder</application>'?,
 ????? ??????? ??????? ??????????? ????????????
 ?? ??????! ??? ?????? ???????????? ? ???????? - ???????? ?????? ????,
-?? ???????? ????? ???????????.
+?? ???????? ????? ???????????. ????? ???? ? ???? ??????
+??????? ???????? ??? ??????????? ?????.
 </para>
 
 <para>
@@ -98,10 +100,9 @@
 (<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>) ? ??????
 ????????????? <application>MPlayer</application>'?? ??????? (??. ????).
 ?? ????? ?????????? ?????? ??????? ????????, ???
-<emphasis role="bold">DivX4</emphasis> (1 ??? 2 ???????),
+<emphasis role="bold">MPEG-4 (DivX4)</emphasis> (1 ??? 2 ???????),
 <systemitem class="library">libavcodec</systemitem>,
-<emphasis role="bold">PCM/MP3/VBR MP3</emphasis> ????. ????? ???? ? ???? ??????
-??????? ???????? ??? ??????????? ?????.
+<emphasis role="bold">PCM/MP3/VBR MP3</emphasis> ????. 
 </para>
 
 <itemizedlist>


More information about the MPlayer-translations mailing list