diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-28 04:12:18 +0200 |
| commit | 479f5e742f22d46430fa265adfa9162f4e2ab865 (patch) | |
| tree | 8450cfd34feb5b81d604101ad9ebfc7b24c1d88e /DOCS | |
| parent | 0d7f9f033cdd677df3b85aca45491955b87a1abc (diff) | |
| parent | 97293969b40797442ec0f612b89a89ace8804561 (diff) | |
| download | mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.bz2 mpv-479f5e742f22d46430fa265adfa9162f4e2ab865.tar.xz | |
Merge svn changes up to r27841
Conflicts:
mplayer.c
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/xml/en/codecs.xml | 14 | ||||
| -rw-r--r-- | DOCS/xml/zh_CN/documentation.xml | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index ad873d4877..3a5fb57527 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> @@ -86,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 && ./configure</screen> You may have to add some options (examine the output of <command>./configure --help</command>). </para></step> @@ -97,11 +92,6 @@ default as it offers better speed. <screen>make && 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> </procedure> 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; |