fixes

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8071 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 13 insertions, 16 deletions

diff --git a/DOCS/codecs.html b/DOCS/codecs.html
index 243628afe7..e38bb0c9a8 100644
--- a/DOCS/codecs.html
+++ b/DOCS/codecs.html
@@ -97,19 +97,21 @@
 <H4><A NAME="libavcodec">2.2.1.2 FFmpeg DivX/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 video streams
+  <B>open source</B> codec package, which is capable of decoding streams
   encoded with
   H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1
-  codecs. Not only some of them can be encoded with, but it also offers higher
-  speed than the Win32 codecs or the ProjectMayo DivX4/5 library!</P>
+  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>
 
 <P>It contains a lot of nice codecs, especially important are the MPEG4
   variants:
-  DivX 3, DivX 4, DivX 5, Windows Media Video 7 (WMV1)</P>
+  DivX 3, DivX 4, DivX 5, Windows Media Video 7 (WMV1). Also a very
+  interesting one is the WMA decoder.</P>
 
 <P>If you use an MPlayer release you have libavcodec right in the
   package, just build as usual. If you use MPlayer from CVS you have to
-  extract libavcodec from the FFmpeg CVS tree as FFmpeg 0.4.5 does <B>not</B>
+  extract libavcodec from the FFmpeg CVS tree as FFmpeg releases <B>don't</B>
   work with MPlayer. In order to achieve this do:</P>
 
 <OL>
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index f75dec03a2..195e639962 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -448,7 +448,8 @@
 
 <UL>
   <LI><B>libavcodec</B>: This codec package is capable of decoding
-    H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1 encoded video streams, on
+    H263/MJPEG/RV10/DivX3/DivX4/DivX5/MP41/MP42/WMV1 encoded video streams and
+    WMA (Windows Media Audio) v1/v2 audio streams, on
     multiple platforms. It is also known to be the fastest for this task.
     See the <A HREF="codecs.html#libavcodec">libavcodec</A> section for details.
     Features:<BR>
@@ -472,7 +473,9 @@
         (example: DV, ATI VCR, MJPEG)</LI>
       <LI>needed if you want to play <B>WMV8 movies</B>. Not needed for old
         ASF's with MP41 or MP42 video (though VoxWare audio is frequent for these
-        files - it's done by the Win32 codec), or WMV7.</LI>
+        files - it's done by the Win32 codec), or WMV7. Also not needed
+        for WMA (Windows Media Audio), libavcodec has opensource decoder
+        for that.</LI>
     </UL>
   </LI>
   <LI><B>DivX4/DivX5</B>: information about this codec is available in the
@@ -1399,7 +1402,7 @@ end
 
 <H2><A NAME="bsd">6.2 *BSD</A></H2>
 
-<P>Mplayer runs on FreeBSD, OpenBSD, NetBSD, BSD/OS and Darwin. To build MPlayer
+<P>MPlayer runs on FreeBSD, OpenBSD, NetBSD, BSD/OS and Darwin. To build MPlayer
   you will need GNU make (gmake - native BSD make will not work) and a recent
   version of binutils.</P>
 
@@ -1428,14 +1431,6 @@ end
 
 <P>MPlayer should work on Solaris 2.6 or newer.</P>
 
-<P>AVI file playback works best on Solaris x86, because you have the
-  option to use the win32 codecs on the x86 platform, or can use
-  MMX/MMX2/3DNow/etc instructions for MP3/DivX/DVD/whatever. On Colaris SPARC,
-  you'll find quite a few AVI files with non working video and/or audio
-  playback, because the video/audio codecs using the Win32 DLLs are not
-  available. However, <B>DivX/OpenDivX</B> movies should work, when using
-  libavcodec.</P>
-
 <P>On <B>UltraSPARC</B>s, MPlayer takes advantage of their <B>VIS</B>
   extensions (equivalent to MMX), currently only in <I>libmpeg2</I>,
   <I>libvo</I> and <I>libavcodec</I>, but not in mp3lib. You can watch a VOB