diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-07 19:57:57 +0300 |
commit | af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (patch) | |
tree | 2ead158ae6e6abfffcccf1609aa5492f9402e24f /DOCS/xml/en/codecs.xml | |
parent | d5c868325cefcd5fad53361d1dfdc9757674eb70 (diff) | |
parent | 4653f5ed7575d6070b54a88b4deb449f838825b3 (diff) | |
download | mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.bz2 mpv-af3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6.tar.xz |
Merge svn changes up to r27025
Conflicts:
command.c
libvo/vosub_vidix.c
libvo/vosub_vidix.h
mplayer.c
Diffstat (limited to 'DOCS/xml/en/codecs.xml')
-rw-r--r-- | DOCS/xml/en/codecs.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 1c4fc2a0bc..36f4a2e0e9 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -174,9 +174,7 @@ default as it offers better speed. <filename class="directory">/usr/local/include/</filename>. </para></step> <step><para> - Recompile <application>MPlayer</application> with - <option>--with-xvidlibdir=<replaceable>/path/to/</replaceable>libxvidcore.a</option> - <option>--with-xvidincdir=<replaceable>/path/to/</replaceable>xvid.h</option>. + Recompile <application>MPlayer</application>. </para></step> </procedure> </sect2> @@ -283,7 +281,7 @@ but if you are interested in a brief overview, you may want to read <systemitem class="library">libavcodec</systemitem> has had at least minimally usable H.264 decoding since around July 2004, however major changes and improvements have been implemented since -that time, both in terms of more functionalities supported and in +that time, both in terms of more functionality supported and in terms of improved CPU usage. Just to be certain, it is always a good idea to use a recent Subversion checkout. @@ -384,7 +382,7 @@ satisfied the requirements for <systemitem class="library">x264</systemitem>. Voxware audio (using DirectShow DLL) </para></listitem> <listitem><para> - alaw and ulaw, various gsm, adpcm and pcm formats and other simple old + alaw and ulaw, various GSM, ADPCM and PCM formats and other simple old audio codecs </para></listitem> <listitem><para> |