summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-01 19:11:44 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-01 19:11:44 +0000
commit077a30a797c8874d3f139b2b9e092085c7ac8d7a (patch)
tree421b73fdb5baf4ce09ce6a166b5613f728b23ff5 /DOCS
parent518319958166efd72597a5a8fb09313522189168 (diff)
downloadmpv-077a30a797c8874d3f139b2b9e092085c7ac8d7a.tar.bz2
mpv-077a30a797c8874d3f139b2b9e092085c7ac8d7a.tar.xz
some updates
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10789 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/en/codecs.html9
1 files changed, 5 insertions, 4 deletions
diff --git a/DOCS/en/codecs.html b/DOCS/en/codecs.html
index fc1134e5d6..5c1bf5983b 100644
--- a/DOCS/en/codecs.html
+++ b/DOCS/en/codecs.html
@@ -58,8 +58,8 @@
<P>The new generation of this codec is called DivX4 and can even decode
movies made with the infamous DivX codec! In addition it is much faster than
- the native Win32 DivX DLLs but slower than libavcodec. Hence its usage as a
- decoder is <B>DISCOURAGED</B>. However, it is useful for encoding. One
+ the native Win32 DivX DLLs but slower than <B>libavcodec</B>. Hence its usage
+ as a decoder is <B>DISCOURAGED</B>. However, it is useful for encoding. One
disadvantage of this codec is that it is not available under an Open Source
license.</P>
@@ -129,12 +129,13 @@
it correctly.</P>
-<H4><A NAME="libavcodec">2.2.1.2 FFmpeg DivX/libavcodec</A></H4>
+<H4><A NAME="libavcodec">2.2.1.2 FFmpeg/libavcodec</A></H4>
<P><A HREF="http://ffmpeg.sourceforge.net">FFmpeg</A> contains an
<B>open source</B> codec package, which is capable of decoding streams
encoded with
- H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1/WMV2/HuffYUV/SVQ1/SVQ3
+ 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!</P>