diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-31 23:13:50 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-31 23:13:50 +0000 |
| commit | e52720b1fc31e968e5e22b73667e582e27a32e14 (patch) | |
| tree | 3a9a4c73158f11404d19cbbff4e1482d2664898c | |
| parent | 7988f6bde60e8543673fc5198f9885c9dd521a87 (diff) | |
| download | mpv-e52720b1fc31e968e5e22b73667e582e27a32e14.tar.bz2 mpv-e52720b1fc31e968e5e22b73667e582e27a32e14.tar.xz | |
libfaad is included now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10767 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/en/codecs.html | 29 | ||||
| -rw-r--r-- | DOCS/xml/en/codecs.xml | 24 |
2 files changed, 3 insertions, 50 deletions
diff --git a/DOCS/en/codecs.html b/DOCS/en/codecs.html index 7fa5215b2f..fc1134e5d6 100644 --- a/DOCS/en/codecs.html +++ b/DOCS/en/codecs.html @@ -456,34 +456,7 @@ MPlayer supports decoding nearly all versions of RealAudio: <P>AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4 files. An open source decoder called FAAD is available from <A HREF="http://www.audiocoding.com/">AudioCoding.com</A>. - You can download the second generation codec FAAD2 at their - <A HREF="http://www.audiocoding.com/download.php">download page</A>. - Unfortunately FAAD2 1.1 does not compile under Linux, so you will have to use - the CVS version:</P> - -<OL> - <LI>cvs -d:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac login</LI> - <LI>cvs -z3 -d:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac co faad2</LI> -</OL> - -<P>You do not need all of faad2 to decode AAC files, libfaad is enough. Build - it like this:</P> - -<OL> - <LI>cd faad2/</LI> - <LI>chmod +x bootstrap</LI> - <LI>./bootstrap</LI> - <LI>./configure</LI> - <LI>cd libfaad</LI> - <LI>make</LI> - <LI>make install</LI> -</OL> - -<P>Binaries are not available from audiocoding.com, but you can (apt-)get - Debian packages from - <A HREF="http://marillat.free.fr/">Christian Marillat's homepage</A> - and Mandrake RPMs from the - <A HREF="http://plf.zarb.org/">P.L.F</A>.</P> + MPlayer includes libfaad 2.0RC1, so you do not need to get it separately.</P> diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml index 0ca8bd08e5..c55c615656 100644 --- a/DOCS/xml/en/codecs.xml +++ b/DOCS/xml/en/codecs.xml @@ -715,28 +715,8 @@ libraries. For installation instructions please see the <para> AAC (Advanced Audio Coding) is an audio codec sometimes found in MOV and MP4 files. An open source decoder called FAAD is available from -<ulink url="http://www.audiocoding.com"/>. You can download the second -generation codec FAAD2 at their <ulink url="http://www.audiocoding.com/download.php"> -download page</ulink>. Unfortunately FAAD2 1.1 does not compile under Linux, so you -will have to use the CVS version: -<screen> -cvs -d:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac login -cvs -z3 -d:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac co faad2 -</screen> -You do not need all of faad2 to decode AAC files, libfaad is enough. Build -it like this: -<screen> -cd faad2/ -chmod +x bootstrap -./bootstrap -./configure -cd libfaad -make -make install -</screen> -Binaries are not available from audiocoding.com, but you can (apt-)get Debian -packages from <ulink url="http://marillat.free.fr">Christian Marillat's homepage</ulink> -and Mandrake RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink>. +<ulink url="http://www.audiocoding.com"/>. +MPlayer includes libfaad 2.0RC1, so you do not need to get it separately. </para> </sect3> |