*** empty log message ***

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

5 files changed, 42 insertions, 6 deletions

diff --git a/DOCS/codecs.html b/DOCS/codecs.html
index 1a4815817f..f556e3614b 100644
--- a/DOCS/codecs.html
+++ b/DOCS/codecs.html
@@ -154,7 +154,17 @@ option to tell <B>MPlayer</B> to use them if possible.</P>
 
 <P><B><A NAME=2.2.1.4>2.2.1.4.  VIVO video</A></B></P>
 
-<P>TODO</P>
+<P><B>MPlayer</B> can play Vivo (1.0 and 2.0) videos. The most suitable codec
+for this task is XAnim's H263 decoder codec (it supports fast YV12 output), you
+can call it with the <CODE>-vc h263xa</CODE> option. Of course you have to
+compile XAnim codecs support it, for details see the <A HREF=#2.2.1.3>XAnim
+video codecs</A>. If this doesn't work, get the <CODE>ivvideo.dll</CODE> DLL
+file (from <A HREF="http://www.mplayerhq.hu/MPlayer/samples/drivers32/ivvideo.dll">here</A>),
+and install it under <CODE>/usr/lib/win32</CODE> or wherever you store the
+Win32 codecs. This latter codec doesn't support YV12 nor YUY2 only BGR modes,
+thus usable only with the X11 and OpenGL outputs. Discouraged.</P>
+
+<P>Be sure to read the <A HREF=#2.2.2.3>VIVO audio codec</A> section too!</P>
 
 
 <P><B><A NAME=2.2.1.5>2.2.1.5.  MPEG 1/2 video</A></B></P>
@@ -167,6 +177,14 @@ reinitialize the codec, and continue exactly from where the failure did occur.
 No speed decrease is measurable.</P>
 
 
+<P><B><A NAME=2.2.1.6>2.2.1.6.  MS Video1</A></B></P>
+
+<P>This is a very old and very bad codec of Microsoft. In the past it was
+decoded with the <CODE>msvidc32.dll</CODE> Win32 codec, now we have our own
+open-source implementation (by <A HREF="mailto:melanson@pcisys.net">Mike
+Melanson</A>).</P>
+
+
 <P><B><A NAME=2.2.2>2.2.2.  Audio codecs</A></B></P>
 
 <P>The most important audio codecs above all :<BR>
@@ -197,6 +215,14 @@ decoding library. If you don't know why is it good, you probably don't need it.<
 option.</P>
 
 
+<P><B><A NAME=2.2.2.3>2.2.2.3.  VIVO audio</A></B></P>
+
+<P>AKA VivoSiren. Currently this isn't supported, but when it will, it will use
+the <CODE>vivog723.acm</CODE> file. Download from
+<A HREF="http://www.mplayerhq.hu/MPlayer/samples/drivers32/vivog723.acm">here</A>,
+then copy it into the <CODE>/usr/lib/win32</CODE> directory, or respectively.</P>
+
+
 <P><B><A NAME=2.2.3>2.2.3. Win32 codec importing howto</A></B></P>
 
 <P><B><A NAME=2.2.3.1>2.2.3.1. VFW codecs</A></B></P>
diff --git a/DOCS/documentation.html b/DOCS/documentation.html
index 9461052766..6ae95f3214 100644
--- a/DOCS/documentation.html
+++ b/DOCS/documentation.html
@@ -50,11 +50,13 @@
         <LI><A HREF="codecs.html#2.2.1.3">2.2.1.3 XAnim codecs</A></LI>
         <LI><A HREF="codecs.html#2.2.1.4">2.2.1.4 VIVO video</A></LI>
         <LI><A HREF="codecs.html#2.2.1.5">2.2.1.5 MPEG1/2 video</A></LI>
+        <LI><A HREF="codecs.html#2.2.1.6">2.2.1.6 MS Video1</A></LI>
       </UL>
       <LI><A HREF="codecs.html#2.2.2">2.2.2 Audio</A></LI>
       <UL>
 	<LI><A HREF="codecs.html#2.2.2.1">2.2.2.1 Hardware AC3 decoding</A></LI>
 	<LI><A HREF="codecs.html#2.2.2.2">2.2.2.2 libmad support</A></LI>
+	<LI><A HREF="codecs.html#2.2.2.3">2.2.2.3 VIVO audio</A></LI>
       </UL>
       <LI><A HREF="codecs.html#2.2.3">2.2.3 Win32 codec importing howto</A></LI>
       <UL>
@@ -994,6 +996,11 @@ Anyone has closer info?</P>
   <LI>-playlist option</LI>
 </UL></LI>
 
+<LI><B><A HREF="mailto:melanson@pcisys.net">Mike Melanson</A></B>
+<UL>
+  <LI>MS Video1 codec open-source implementation</LI>
+</UL></LI>
+
 </UL></P>
 
 <P>Main testers:</P>
diff --git a/DOCS/formats.html b/DOCS/formats.html
index e6cc328651..045edb0d9c 100644
--- a/DOCS/formats.html
+++ b/DOCS/formats.html
@@ -96,8 +96,10 @@ but we think the parser is perfect.
 
 <P><B><A NAME=2.1.1.5>2.1.1.5. VIV files</A></B></P>
 
-<P>Hey this is new code in <B>MPlayer</B>, be gentle! Seeking is
-currently nonexistent, audio too. TODO : complete this section.</P>
+<P><B>MPlayer</B> happily demuxes VIVO file formats. This code is new, and
+is possibly buggy, no seeking yet. See the <A HREF=codecs.html#2.2.1.4>VIVO video codec</A>
+and <A HREF=codecs.html#2.2.2.3>VIVO audio codec</A> sections for installation
+instructions.</P>
 
 
 <P><B><A NAME=2.1.2>2.1.2. Audio formats</A></B></P>
diff --git a/DOCS/mencoder.1 b/DOCS/mencoder.1
index 51af92913e..7a8f094f17 100644
--- a/DOCS/mencoder.1
+++ b/DOCS/mencoder.1
@@ -131,6 +131,7 @@ Available options:
   key=XXX        maximum keyframe interval
                  (in frames)
   deinterlace    enable deinterlacing
+                 (don't use, DivX4 is buggy!)
   q=XXXX         quality (1-fastest, 5-best)
   min_quant=XXX  minimum quantizer (0-32)
   max_quant=XXX  maximum quantizer (0-32)
diff --git a/DOCS/tech/formats.txt b/DOCS/tech/formats.txt
index 687e356a1f..03ac0b46e9 100644
--- a/DOCS/tech/formats.txt
+++ b/DOCS/tech/formats.txt
@@ -35,7 +35,7 @@
 
   - AVI streams.
     Two kind of RIFF AVI files exists:
-    1. interleaved: audio and video content is interlaved. it's faster and
+    1. interleaved: audio and video content is interleaved. it's faster and
        requires only 1 reading thread, so it's recommended (and mostly used).
     2. non-interleaved: audio and video aren't interleaved, i mean first come
        whole video followed by whole audio. it requires 2 reading process or
@@ -46,7 +46,7 @@
        played as non-interleaved otherwise you get a-v desync or buffer overflow.
 
     MPlayer supports 2 kind of timing for AVI files:
-    - bps-based: it is based on bitrate/samplerate of video/audio steram.
+    - bps-based: it is based on bitrate/samplerate of video/audio stream.
       this method is used by most players, including avifile and wmp.
       files with broken headers, and files created with VBR audio but not
       vbr-compliant encoder will result a-v desync with this method.
@@ -73,7 +73,7 @@
     I also note, that most AVI encoders/multiplexers create bad files if
     using VBR audio. only 2 exception (known by me): NaNDub and MEncoder.
     
-    FPS: only constant framerate allowed, but it's possib;e to skip frames.
+    FPS: only constant framerate allowed, but it's possible to skip frames.
 
   - ASF streams:
     ASF (active streaming format) comes from Microsoft. they developed two