Context Navigation

-              r7f85c32
+              r21c0c162
 linkend="liba52"/>, <xref
 linkend="libmad"/>, <xref linkend="speex"/>, <ulink url="http://www.theora.org/">Theora</ulink>,
 <xref linkend="ffmpeg"/>,
  <!--<xref linkend="opendivx"/>-->and <xref linkend="xvid"/></para></sect4>
+<xref linkend="ffmpeg"/>
+and <xref linkend="xvid"/></para></sect4>
 </sect3>

multimedia/libdriv/xvid/xvid-intro.xml

-              r7f85c32
+              r21c0c162
 <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

-              r7f85c32
+              r21c0c162
 <!-- 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 % xine-ui SYSTEM "videoutils/xine-ui/xine-ui.ent">
 <!ENTITY % transcode SYSTEM "videoutils/transcode/transcode.ent">
-%opendivx;
 %ffmpeg;
 %avifile;

-              r7f85c32
+              r21c0c162
 <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
 …
 make install</command></userinput></screen>
-<!--
-<para>Replace <userinput>&lt;version&gt;</userinput> with whichever
-MPlayer Version number is appropriate.</para>
--->
 </sect2>

r7f85c32	r21c0c162
10	10	<acronym>CODEC</acronym> to install.</para>
11	11
12		~~<!-- &opendivx; -->~~
13	12	&ffmpeg;
14	13	&avifile;

Note: See TracChangeset for help on using the changeset viewer.