summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-12 21:16:58 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-12 21:16:58 +0000
commit7258a6627540bc1e0d4d07b72ca22328b3fd6b49 (patch)
tree20ae2f7f857e30f9624903dcdaf0d2258820b89c /DOCS
parentc785ee60fd1e8c4b477007e6f460ad5f8dad178c (diff)
downloadmpv-7258a6627540bc1e0d4d07b72ca22328b3fd6b49.tar.bz2
mpv-7258a6627540bc1e0d4d07b72ca22328b3fd6b49.tar.xz
reworked the libavcodec section
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11090 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/codecs.xml31
1 files changed, 20 insertions, 11 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 0a04228ebd..45451d0db9 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -195,11 +195,9 @@ did not install or configure it correctly.
<para>
<ulink url="http://ffmpeg.sourceforge.net">FFmpeg</ulink> contains an
<emphasis role="bold">open source</emphasis> codec package, which is capable
-of decoding streams encoded with H263/MJPEG/LJPEG/RV10/DivX3/DivX4/DivX5/MP41/
-MP42/WMV1/WMV2/HuffYUV/SVQ1/SVQ3/MPEG1/MPEG2/VCR1/VCR2/ASV1/ASV2/CLJR
-video, or WMA (Windows Media Audio) audio codecs. Not only some of them can be
-encoded with, but it also offers higher speed than the Win32 codecs or the
-DivX.com DivX4/5 library!
+of decoding streams with various audio and video codecs. It also offers an
+impressing encoding facility and higher speed than the Win32 codecs or the
+DivX.com DivX4/5 libraries!
</para>
<para>
@@ -210,17 +208,22 @@ is the WMA decoder.
<para>
The most recent codec deserving credit is the <emphasis role="bold">Sorenson 3</emphasis>
-(SVQ3) codec. This is the first, completely opensource implementation of this
-codec. It's even faster than the original. Be sure to prefer this instead
-of the binary codec!
+(SVQ3) codec. This is the first, completely opensource implementation. It's even
+faster than the original. Be sure to prefer this instead of the binary codec!
+</para>
+
+<para>
+For a complete list of supported codecs please visit the FFmpeg homepage.
+Supported <ulink url="http://www.ffmpeg.org/ffmpeg-doc.html#SEC19">video</ulink>
+and <ulink url="http://www.ffmpeg.org/ffmpeg-doc.html#SEC20">audio</ulink> codecs.
</para>
<para>
If you use an <application>MPlayer</application> release you have libavcodec
right in the package, just build as usual. If you use
<application>MPlayer</application> from CVS you have to extract libavcodec from
-the FFmpeg CVS tree as FFmpeg releases <emphasis role="bold">don't</emphasis>
-work with <application>MPlayer</application>. In order to achieve this do:
+the FFmpeg CVS tree as FFmpeg releases are very rare. The CVS is mostly stable
+and offers the most features. In order to achieve this do:
</para>
<procedure>
@@ -234,12 +237,18 @@ work with <application>MPlayer</application>. In order to achieve this do:
Move the <filename>libavcodec</filename> directory from the FFmpeg
sources to the root of the <application>MPlayer</application> CVS tree.
It should look like this:
- <filename>main/libavcodec</filename>
+ <filename class="directory">main/libavcodec</filename>
</para><para>
Symlinking is <emphasis role="bold">not</emphasis> enough, you have to
copy/move it!
</para></step>
<step><para>
+ If you prefer having libavcodec updated at the same time you update
+ <application>MPlayer</application> CVS, put the following line into the
+ <filename>main/CVS/Entires</filename> file:
+ <screen>D/libavcodec////</screen>
+ </para></step>
+<step><para>
Compile. <filename>configure</filename> should detect problems before
compilation.
</para></step>