Remove support for obsolete and non-free divx4/odivx libraries.

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

3 files changed, 1 insertions, 185 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index a2bdf7dfb9..a6ae60ce9a 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3870,14 +3870,6 @@ Do not play/\:encode video.
 In many cases this will not work, use \-vc null \-vo null instead.
 .
 .TP
-.B \-oldpp <quality> (OpenDivX only) (OBSOLETE)
-Use the OpenDivX postprocessing code instead of the internal one.
-Superseded by \-pp, the internal postprocessing offers better
-quality and performance.
-The valid range of \-oldpp values varies by codec, it is mostly
-0\-6, where 0=disable, 6=slowest/\:best.
-.
-.TP
 .B \-pp <quality> (also see \-vf pp)
 Set the DLL postprocess level.
 This option is no longer usable with \-vf pp.
@@ -3987,8 +3979,6 @@ See \-vc help for a full list of available codecs.
 .RSs
 .IPs "\-vc divx"
 Force Win32/\:VfW DivX codec, no fallback.
-.IPs "\-vc divx4,"
-Try divx4linux codec first, then fall back on others.
 .IPs "\-vc -divxds,-divx,"
 Skip Win32 DivX codecs.
 .IPs "\-vc ffmpeg12,mpeg12,"
@@ -6484,8 +6474,6 @@ Use \-ovc help to get a list of available video codecs.
 .RSs
 .IPs "\-ovc copy"
 no encoding, just streamcopy
-.IPs "\-ovc divx4"
-Encode to DivX4/\:DivX5.
 .IPs "\-ovc raw"
 Encode to an arbitrary uncompressed format (use '\-vf format' to select).
 .IPs "\-ovc lavc"
@@ -6528,89 +6516,10 @@ syntax:
 .B \-<codec>opts <option1[=value],option2,...>
 .
 .PP
-Where <codec> may be: lavc, xvidenc, divx4, lame, toolame, twolame,
+Where <codec> may be: lavc, xvidenc, lame, toolame, twolame,
 nuv, xvfw, faac, x264enc, mpeg, lavf.
 .
 .
-.SS divx4 (\-divx4opts)
-.
-DivX4 is obsolete and only supported for completeness.
-For details about DivX4 options, read the source, most options are not
-described here.
-.
-.TP
-.B help\ \ \ 
-get help
-.
-.TP
-.B br=<value>
-Specify bitrate.
-.RSs
-.IPs 4\-16000
-(in kbit)
-.IPs 16001\-24000000
-(in bit)
-.RE
-.
-.TP
-.B key=<value>
-maximum keyframe interval (in frames)
-.
-.TP
-.B deinterlace
-Enable deinterlacing (avoid it, DivX4 is buggy).
-.
-.TP
-.B q=<1\-5>
-quality (1\-fastest, 5\-best)
-.
-.TP
-.B min_quant=<1\-31>
-minimum quantizer
-.
-.TP
-.B max_quant=<1\-31>
-maximum quantizer
-.
-.TP
-.B rc_period=<value>
-rate control period
-.
-.TP
-.B rc_reaction_period=<value>
-rate control reaction period
-.
-.TP
-.B rc_reaction_ratio=<value>
-rate control reaction ratio
-.
-.TP
-.B crispness=<0\-100>
-Specify crispness/\:smoothness.
-.
-.TP
-.B pass=<1\-2>
-With this you can encode two pass DivX4 files.
-First encode with pass=1, then do another encode with the
-same parameters and pass=2.
-.
-.TP
-.B vbrpass=<0\-2>
-Override the pass argument and use the XviD VBR library instead of DivX4 VBR.
-Available options are:
-.PD 0
-.RSs
-.IPs 0
-one pass encoding (as in not putting pass on the command line)
-.IPs 1
-Analysis (first) pass of two pass encoding.
-The resulting AVI file can be directed to /dev/\:null.
-.IPs 2
-Final (second) pass of two pass encoding.
-.RE
-.PD 1
-.
-.
 .SS lame (\-lameopts)
 .
 .TP
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 84b1bd5d5a..2ac51e4689 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -76,77 +76,6 @@ and help us add support for it.
 </para>
 
 
-<sect2 id="divx4-5">
-<title>DivX4/DivX5</title>
-
-<para>
-This section contains information about the DivX4 and DivX5 codecs of
-<ulink url="http://www.projectmayo.com">Project Mayo</ulink>.
-Their first available alpha version was OpenDivX 4.0 alpha 47 and 48.
-Support for this was included in <application>MPlayer</application> in the
-past, and built by default. We also used its postprocessing code to
-optionally enhance visual quality of MPEG-1/2 movies. Now we use our own,
-for all file types.
-</para>
-
-<para>
-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
-<systemitem class="library">libavcodec</systemitem>.
-Hence its usage as a decoder is
-<emphasis role="bold">discouraged</emphasis>. However, it is useful for
-encoding. One disadvantage of this codec is that it is not available under an
-Open Source license.
-</para>
-
-<para>
-DivX4 works in two modes:
-<variablelist>
-<varlistentry><term><option>-vc odivx</option></term>
-<listitem><simpara>
-  Uses the codec in OpenDivX fashion. In this case it produces YV12 images
-  in its own buffer, and <application>MPlayer</application> does colorspace
-  conversion via libvo. (<emphasis role="bold">Fast, recommended!</emphasis>)
-  </simpara></listitem>
-</varlistentry>
-<varlistentry><term><option>-vc divx4</option></term>
-<listitem><simpara>
-  Uses the colorspace conversion of the codec.  In this mode you can use
-  YUY2/UYVY, too. (<emphasis role="bold">SLOW</emphasis>)
-  </simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-The <option>-vc odivx</option> method is usually faster, due to the fact
-that it transfers image data in YV12 (planar YUV 4:2:0) format, thus
-requiring much less bandwidth on the bus. For packed YUV modes (YUY2, UYVY)
-use the <option>-vc divx4</option> method. For RGB modes the speed is the
-same, differing at best according to your current color depth.
-If your video output driver supports direct rendering, then <option>-vc
-divx4</option> may be faster, or even the fastest solution.
-</para>
-
-<para>
-The DivX4/5 binary codec library can be downloaded from
-<ulink url="http://avifile.sf.net">avifile</ulink> or
-<ulink url="http://www.divx.com">divx.com</ulink>
-Unpack it, run <filename>./install.sh</filename> as root and do not forget to add
-<filename class="directory">/usr/local/lib</filename> to your
-<filename>/etc/ld.so.conf</filename> and running <command>ldconfig</command>.
-</para>
-
-<para>
-<application>MPlayer</application> autodetects DivX4/DivX5 if it is
-properly installed, just compile as usual. If it does not detect it, you
-did not install or configure it correctly.
-</para>
-
-</sect2>
-
-
 <sect2 id="ffmpeg" xreflabel="FFmpeg/libavcodec">
 <title>FFmpeg/libavcodec</title>
 
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index c1aa0f6d3e..3ea2f15e4d 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -196,28 +196,6 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
   <link linkend="sorenson">Sorenson video codec</link> section.
   </para></listitem>
 <listitem><para>
-  <emphasis role="bold">DivX4/DivX5</emphasis>: information about this codec is
-  available in the <link linkend="divx4-5">DivX4/DivX5</link> section. You possibly
-  don't want this codec as
-  <emphasis role="bold"><systemitem class="library">libavcodec</systemitem></emphasis>
-  (see above) is much faster and has better quality than this, for both decoding
-  and encoding. Features:
-  <itemizedlist>
-  <listitem><simpara>
-    one pass or two pass encoding with
-    <link linkend="mencoder"><application>MEncoder</application></link>
-    </simpara></listitem>
-  <listitem><simpara>
-    can play old <emphasis role="bold">DivX3</emphasis> movies much faster than
-    the Win32 DLL but slower than
-    <emphasis role="bold"><systemitem class="library">libavcodec</systemitem></emphasis>!
-    </simpara></listitem>
-  <listitem><simpara>
-    it's closed-source, and only a x86 version is available.
-    </simpara></listitem>
-  </itemizedlist>
-  </para></listitem>
-<listitem><para>
   <emphasis role="bold">XviD</emphasis>: Open source encoding alternative to
   DivX4Linux. Features:
   <itemizedlist>