removed opendivx

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1288 af4574ff-66df-0310-9fd7-8a98e5e911e0

multimedia/libdriv/xine-lib/xine-lib-intro.xml

@@ -27,8 +27,8 @@ linkend="DirectFB"/>, <ulink url=
 <xref linkend="libogg"/>, <xref linkend="libvorbis"/>, <xref
 linkend="liba52"/>, <xref
 linkend="libmad"/>, <xref linkend="speex"/>, <ulink url="http://www.theora.org/">Theora</ulink>, 
-<xref linkend="ffmpeg"/>,
+<xref linkend="ffmpeg"/>
- <!--<xref linkend="opendivx"/>-->and <xref linkend="xvid"/></para></sect4>
+and <xref linkend="xvid"/></para></sect4>
 </sect3>
 
 </sect2>

multimedia/libdriv/xvid/xvid-intro.xml

@@ -1,6 +1,26 @@
 <sect2>
 <title>Introduction to <application>XviD</application></title>
 
+<!--
+OpenDivX or Xvid?
+
+OpenDivX is a free implementation of the mpeg4-codec. Alas, the 
+developers at ProjectMayo didn't gratefully release their actual source
+in compileable versions, so the displeasure of the users majority
+canalized into a new project named Xvid.
+
+Xvid development was interrupted in Autumn 2002 due to a code-theft 
+the developers at Sigma design committed but it is continued now.
+
+For worse luck, OpenDivX and Xvid are using the same header file 
+names (an issue that wouldn't be resolved easily) and function
+namespace, so you'll have to choose which one to use.
+
+I personally vote for Xvid, because the installation from sources
+is much smoother. If you use mencoder and transcode at the same time,
+you may want to choose different codecs for each.
+-->
+
 <para><application>XviD</application> is a <acronym>MPEG</acronym>-4
 compliant video <acronym>CODEC</acronym>.</para>
 

multimedia/multimedia.ent

@@ -61,13 +61,11 @@
 
 <!-- Video utilities -->
 <!ENTITY multimedia-videoutils SYSTEM "videoutils/videoutils.xml">
-<!ENTITY % opendivx SYSTEM "videoutils/opendivx/opendivx.ent">
 <!ENTITY % ffmpeg SYSTEM "videoutils/ffmpeg/ffmpeg.ent">
 <!ENTITY % avifile SYSTEM "videoutils/avifile/avifile.ent">
 <!ENTITY % mplayer SYSTEM "videoutils/mplayer/mplayer.ent">
 <!ENTITY % xine-ui SYSTEM "videoutils/xine-ui/xine-ui.ent">
 <!ENTITY % transcode SYSTEM "videoutils/transcode/transcode.ent">
-%opendivx;
 %ffmpeg;
 %avifile;
 %mplayer;

multimedia/videoutils/opendivx.xml

@@ -1,11 +0,0 @@
-<sect1 id="opendivx" xreflabel="opendivx-&opendivx-version;">
-<?dbhtml filename="opendivx.html" dir="multimedia"?>
-<title>opendivx-&opendivx-version;</title>
-
-&opendivx-intro;
-&opendivx-inst;
-&opendivx-exp;
-&opendivx-desc;
-
-</sect1>
-

multimedia/videoutils/transcode/transcode-inst.xml

@@ -1,33 +1,6 @@
 <sect2>
 <title>Installation of <application>transcode</application></title>
 
-<!--
-<para>Everything that can be utilized by
-<application>transcode</application> should be installed first.</para>
-<sect3>
-<title>OpenDivX or Xvid?</title>
-
-<para>OpenDivX is a free implementation of the mpeg4-codec. Alas, the 
-developers at ProjectMayo didn't gratefully release their actual source in 
-compileable versions, so the displeasure of the users majority canalized 
-into a new project named Xvid.</para>
-
-<para>Xvid development was interrupted in Autumn 2002 due to a code-theft 
-the developers at Sigma design committed but it is continued now.</para>
-
-<para>For worse luck, OpenDivX and Xvid are using the same header file 
-names (an issue that wouldn't be resolved easily) and function namespace, 
-so you'll have to choose which one to use in transcode.</para>
-
-<para>I personally vote for Xvid, because the installation from sources
-is much smoother. If you use mencoder and transcode at the same time,
-you may want to choose different codecs for each.</para>
-
-</sect3>
-<sect3>
-<title>Installing <application>transcode</application></title>
--->
-
 <para>Install <application>transcode</application> by running the following 
 commands:</para>
 
@@ -35,9 +8,4 @@ commands:</para>
 make &amp;&amp;
 make install</command></userinput></screen>
 
-<!--
-<para>Replace <userinput>&lt;version&gt;</userinput> with whichever
-MPlayer Version number is appropriate.</para>
--->
-
 </sect2>

multimedia/videoutils/videoutils.xml

@@ -9,7 +9,6 @@ libraries, all the configurations and your reward is that you get to
 watch a movie. Not to worry though, there is always one more
 <acronym>CODEC</acronym> to install.</para>
 
-<!-- &opendivx; -->
 &ffmpeg;
 &avifile;
 &mplayer;