From 75a6111d10a0d5b12184d9b2fb193c25a0e92a85 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 26 Oct 2008 08:55:30 +0000
Subject: Remove obsolete and pointless reference to Xvid divxcompat mode.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27830 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/en/codecs.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index ad873d4877..1c5d25f0de 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -96,11 +96,6 @@ default as it offers better speed.
 <step><para>
   <screen>make &amp;&amp; make install</screen>
 </para></step>
-<step><para>
-  If you specified <option>--enable-divxcompat</option>,
-  copy <filename>../../src/divx4.h</filename> to
-  <filename class="directory">/usr/local/include/</filename>.
-</para></step>
 <step><para>
   Recompile <application>MPlayer</application>.
 </para></step>
-- 
cgit v1.2.3


From 6123b251711e48722e43ed4afc9c55023041476c Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 26 Oct 2008 09:06:16 +0000
Subject: Remove notice about necessary tool versions in Xvid section, the info
 is most likely outdated.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27831 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/en/codecs.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 1c5d25f0de..6b1baa98b8 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -72,9 +72,7 @@ default as it offers better speed.
   The CVS version is usually stable enough to use, as most of the time it
   features fixes for bugs that exist in releases.
   Here is what to do to make <systemitem class="library">Xvid</systemitem>
-  CVS work with <application>MEncoder</application> (you need at least
-  <application>autoconf</application> 2.50,
-  <application>automake</application> and <application>libtool</application>):
+  CVS work with <application>MEncoder</application>:
 </para>
 <step><para>
   <screen>cvs -z3 -d:pserver:anonymous@cvs.xvid.org:/xvid login</screen>
-- 
cgit v1.2.3


From e35f511ff553b4bd085f332d3e91390df8305b20 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 26 Oct 2008 09:44:32 +0000
Subject: Remove reference to containers.xml, which was removed.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27832 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/zh_CN/documentation.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'DOCS')

diff --git a/DOCS/xml/zh_CN/documentation.xml b/DOCS/xml/zh_CN/documentation.xml
index 824c2d491c..781ffd4b01 100644
--- a/DOCS/xml/zh_CN/documentation.xml
+++ b/DOCS/xml/zh_CN/documentation.xml
@@ -179,7 +179,6 @@ It can encode with various codecs, like
 &cd-dvd.xml;
 &faq.xml;
 
-&containers.xml;
 &codecs.xml;
 &video.xml;
 &audio.xml;
-- 
cgit v1.2.3


From 26aa72abcb90693c369ee121c912a723679f0519 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 26 Oct 2008 09:49:33 +0000
Subject: Merge two Xvid build steps.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27833 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 DOCS/xml/en/codecs.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'DOCS')

diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index 6b1baa98b8..3a5fb57527 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -84,10 +84,7 @@ default as it offers better speed.
   <screen>cd xvidcore/build/generic</screen>
 </para></step>
 <step><para>
-  <screen>./bootstrap.sh</screen>
-</para></step>
-<step><para>
-  <screen>./configure</screen>
+  <screen>./bootstrap.sh &amp;&amp; ./configure</screen>
   You may have to add some options (examine the output of
   <command>./configure --help</command>).
 </para></step>
-- 
cgit v1.2.3