summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-01-01 14:27:41 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-01-31 16:00:58 +0200
commit42ed53f221dc6570b7f6e05ef93f38b7457a68d8 (patch)
tree457bc346edf64f3affb2bee9870c106fc03f866c
parentf6fb536f87e687a4aacca75dd9ad1c7b71ffa731 (diff)
downloadmpv-42ed53f221dc6570b7f6e05ef93f38b7457a68d8.tar.bz2
mpv-42ed53f221dc6570b7f6e05ef93f38b7457a68d8.tar.xz
libfaad2:/ Remove forked internal libfaad2 copy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove AAC/FAAD2 installation instructions. There is nothing special about building and installing FAAD2, so there is no longer a need to keep maintaining instructions for it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Copyright8
-rw-r--r--DOCS/xml/cs/install.xml37
-rw-r--r--DOCS/xml/de/install.xml37
-rw-r--r--DOCS/xml/en/install.xml34
-rw-r--r--DOCS/xml/es/install.xml35
-rw-r--r--DOCS/xml/fr/install.xml28
-rw-r--r--DOCS/xml/hu/install.xml33
-rw-r--r--DOCS/xml/it/install.xml34
-rw-r--r--DOCS/xml/pl/install.xml38
-rw-r--r--DOCS/xml/ru/install.xml34
-rw-r--r--Makefile41
-rwxr-xr-xconfigure66
-rw-r--r--libfaad2/analysis.h49
-rw-r--r--libfaad2/bits.c213
-rw-r--r--libfaad2/bits.h385
-rw-r--r--libfaad2/cfft.c1002
-rw-r--r--libfaad2/cfft.h53
-rw-r--r--libfaad2/cfft_tab.h1820
-rw-r--r--libfaad2/codebook/hcb.h142
-rw-r--r--libfaad2/codebook/hcb_1.h183
-rw-r--r--libfaad2/codebook/hcb_10.h309
-rw-r--r--libfaad2/codebook/hcb_11.h412
-rw-r--r--libfaad2/codebook/hcb_2.h182
-rw-r--r--libfaad2/codebook/hcb_3.h193
-rw-r--r--libfaad2/codebook/hcb_4.h196
-rw-r--r--libfaad2/codebook/hcb_5.h193
-rw-r--r--libfaad2/codebook/hcb_6.h179
-rw-r--r--libfaad2/codebook/hcb_7.h159
-rw-r--r--libfaad2/codebook/hcb_8.h170
-rw-r--r--libfaad2/codebook/hcb_9.h369
-rw-r--r--libfaad2/codebook/hcb_sf.h273
-rw-r--r--libfaad2/common.c519
-rw-r--r--libfaad2/common.h441
-rw-r--r--libfaad2/decoder.c1095
-rw-r--r--libfaad2/decoder.h122
-rw-r--r--libfaad2/drc.c170
-rw-r--r--libfaad2/drc.h46
-rw-r--r--libfaad2/drm_dec.c990
-rw-r--r--libfaad2/drm_dec.h97
-rw-r--r--libfaad2/error.c61
-rw-r--r--libfaad2/error.h41
-rw-r--r--libfaad2/faad.h32
-rw-r--r--libfaad2/filtbank.c404
-rw-r--r--libfaad2/filtbank.h58
-rw-r--r--libfaad2/fixed.h265
-rw-r--r--libfaad2/hcr.c409
-rw-r--r--libfaad2/huffman.c556
-rw-r--r--libfaad2/huffman.h44
-rw-r--r--libfaad2/ic_predict.c267
-rw-r--r--libfaad2/ic_predict.h249
-rw-r--r--libfaad2/iq_table.h16455
-rw-r--r--libfaad2/is.c106
-rw-r--r--libfaad2/is.h64
-rw-r--r--libfaad2/kbd_win.h2294
-rw-r--r--libfaad2/local_changes.diff341
-rw-r--r--libfaad2/lt_predict.c215
-rw-r--r--libfaad2/lt_predict.h63
-rw-r--r--libfaad2/mdct.c298
-rw-r--r--libfaad2/mdct.h45
-rw-r--r--libfaad2/mdct_tab.h3652
-rw-r--r--libfaad2/mp4.c308
-rw-r--r--libfaad2/mp4.h53
-rw-r--r--libfaad2/ms.c74
-rw-r--r--libfaad2/ms.h41
-rw-r--r--libfaad2/neaacdec.h254
-rw-r--r--libfaad2/output.c603
-rw-r--r--libfaad2/output.h45
-rw-r--r--libfaad2/pns.c265
-rw-r--r--libfaad2/pns.h53
-rw-r--r--libfaad2/ps_dec.c1988
-rw-r--r--libfaad2/ps_dec.h148
-rw-r--r--libfaad2/ps_syntax.c545
-rw-r--r--libfaad2/ps_tables.h547
-rw-r--r--libfaad2/pulse.c56
-rw-r--r--libfaad2/pulse.h40
-rw-r--r--libfaad2/rvlc.c530
-rw-r--r--libfaad2/rvlc.h53
-rw-r--r--libfaad2/sbr_dct.c2271
-rw-r--r--libfaad2/sbr_dct.h49
-rw-r--r--libfaad2/sbr_dec.c617
-rw-r--r--libfaad2/sbr_dec.h249
-rw-r--r--libfaad2/sbr_e_nf.c507
-rw-r--r--libfaad2/sbr_e_nf.h47
-rw-r--r--libfaad2/sbr_fbt.c761
-rw-r--r--libfaad2/sbr_fbt.h52
-rw-r--r--libfaad2/sbr_hfadj.c1720
-rw-r--r--libfaad2/sbr_hfadj.h54
-rw-r--r--libfaad2/sbr_hfgen.c666
-rw-r--r--libfaad2/sbr_hfgen.h46
-rw-r--r--libfaad2/sbr_huff.c357
-rw-r--r--libfaad2/sbr_huff.h43
-rw-r--r--libfaad2/sbr_noise.h561
-rw-r--r--libfaad2/sbr_qmf.c633
-rw-r--r--libfaad2/sbr_qmf.h52
-rw-r--r--libfaad2/sbr_qmf_c.h365
-rw-r--r--libfaad2/sbr_syntax.c871
-rw-r--r--libfaad2/sbr_syntax.h64
-rw-r--r--libfaad2/sbr_tf_grid.c258
-rw-r--r--libfaad2/sbr_tf_grid.h44
-rw-r--r--libfaad2/sine_win.h4301
-rw-r--r--libfaad2/specrec.c1241
-rw-r--r--libfaad2/specrec.h46
-rw-r--r--libfaad2/ssr.c172
-rw-r--r--libfaad2/ssr.h56
-rw-r--r--libfaad2/ssr_fb.c182
-rw-r--r--libfaad2/ssr_fb.h44
-rw-r--r--libfaad2/ssr_ipqf.c188
-rw-r--r--libfaad2/ssr_ipqf.h37
-rw-r--r--libfaad2/ssr_win.h626
-rw-r--r--libfaad2/structs.h492
-rw-r--r--libfaad2/syntax.c2516
-rw-r--r--libfaad2/syntax.h126
-rw-r--r--libfaad2/tns.c306
-rw-r--r--libfaad2/tns.h48
-rw-r--r--libmpcodecs/ad_faad.c33
-rw-r--r--rpm/mplayer.spec2
116 files changed, 7 insertions, 62605 deletions
diff --git a/Copyright b/Copyright
index 9a7b7e0ab6..01d7e9c0d5 100644
--- a/Copyright
+++ b/Copyright
@@ -21,14 +21,6 @@ License: GNU Lesser General Public License, some parts GNU General Public
License, GNU General Public License when combined
-Name: FAAD2
-Version: 2.1 beta (20040915 CVS snapshot) + fixes and portability patches
-URL: http://www.audiocoding.com
-Directory: libfaad2
-Copyright: 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
-License: GNU General Public License
-
-
Name: libdvdcss
Version: Subversion r237 + local changes
URL: http://developers.videolan.org/libdvdcss/
diff --git a/DOCS/xml/cs/install.xml b/DOCS/xml/cs/install.xml
index 571f8ae9ba..ba7fe732de 100644
--- a/DOCS/xml/cs/install.xml
+++ b/DOCS/xml/cs/install.xml
@@ -432,43 +432,6 @@ Now rerun <filename>./configure</filename> for
<!-- ********** -->
-<sect2 id="aac">
-<title>Kodek AAC</title>
-
-<para>
-AAC (Advanced Audio Coding) je audio kodek, který lze občas nalézt v MOV a
-MP4 souborech. Open source dekodér jménem FAAD je k dispozici na
-<ulink url="http://www.audiocoding.com"/>.
-<application>MPlayer</application> obsahuje CVS obraz libfaad 2.1 beta,
-takže jej nemusíte stahovat dodatečně.
-</para>
-
-<para>
-Pokud používáte gcc 3.2 které nedokáže zkompilovat naši zabudovanou FAAD,
-nebo chcete použít externí knihovnu z jiných důvodů, stáhněte si ji z
-<ulink url="http://www.audiocoding.com/modules/mydownloads/">download stránky</ulink>
-a předejte volbu <option>--enable-faad-external</option> skriptu
-<filename>./configure</filename>.
-Pro dekódování AAC souborů nepotřebujete celou faad2, libfaad stačí.
-Zkompilujete ji takto:
-<screen>
-cd faad2/
-sh bootstrap
-./configure
-cd libfaad
-make
-make install
-</screen>
-Binárky na audiocoding.com nenajdete, ale můžete si je opatřit v balíčcích pro
-Debian z
-<ulink url="http://www.debian-multimedia.org/">domácí stránky Christiana Marillata</ulink>,
-Mandrake/Mandriva RPM z <ulink url="http://plf.zarb.org">P.L.F</ulink>
-a Fedora RPM ze stránek <ulink url="http://rpm.livna.org/">Livna</ulink>.
-</para>
-</sect2>
-
-<!-- ********** -->
-
<sect2 id="amr">
<title>AMR kodeky</title>
diff --git a/DOCS/xml/de/install.xml b/DOCS/xml/de/install.xml
index 7a0e7a940b..0de6409eb6 100644
--- a/DOCS/xml/de/install.xml
+++ b/DOCS/xml/de/install.xml
@@ -472,43 +472,6 @@ make install</screen>
</sect2>
- <sect2 id="aac">
- <title>AAC Codec</title>
- <para>
- AAC (Advanced Audio Coding) ist ein Audiocodec, der vorwiegend
- in MOV- und MP4-Dateien vorkommt. Ein Open-Source-Decoder namens
- FAAD ist auf <ulink url="http://www.audiocoding.com"/>
- verfügbar. <application>MPlayer</application> enthält
- eine CVS Version von libfaad 2.1 beta, so dass es nicht extra
- installiert werden muss.
- </para>
-
- <para>
- Um die externe FAAD-Bibliothek verwenden zu können (z.B. um mit gcc 3.2
- compilieren zu können, der die interne Version nicht übersetzt), muss
- die Bibliothek von der
- <ulink url="http://www.audiocoding.com/modules/mydownloads/">Download Seite</ulink>
- heruntergeladen und installiert werden. Anschließend muss die Option
- <option>--enable-faad-external</option> an <filename>./configure</filename>
- übergeben werden, damit die externe Bibliothek erkannt wird.
- Es ist lediglich erforderlich, vorher libfaad zu installieren, und zwar so:
- <screen>
-cd faad2/
-sh bootstrap
-./configure
-cd libfaad
-make
-make install<!--
- --></screen>
- Binärpakete sind auf audiocoding.com nicht erhältlich, Debian-Pakete
- können aber mit (apt-)get von
- <ulink url="http://www.debian-multimedia.org/">Christian Marillat's Homepage</ulink>, Mandrake/Mandriva RPMs von
- <ulink url="http://plf.zarb.org">P.L.F</ulink> und RedHat RPMs
- von <ulink url="http://greysector.rangers.eu.org/">Grey Sector</ulink>
- heruntergeladen werden.
- </para>
- </sect2>
-
<sect2 id="amr">
<title>AMR Codecs</title>
<para>
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index f10f766313..1ab56f1cc4 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -410,40 +410,6 @@ Now rerun <filename>./configure</filename> for
<!-- ********** -->
-<sect2 id="aac">
-<title>AAC</title>
-
-<para>
-An open source AAC decoder called FAAD2 is available from
-<ulink url="http://www.audiocoding.com/downloads.html"/>.
-<application>MPlayer</application> includes a copy of it in its source tree.
-If you want to use the external library instead, install it and pass
-<option>--enable-faad-external</option> to <filename>./configure</filename>.
-</para>
-
-<para>
-FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get
-Debian packages from
-<ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>,
-Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink>
-and Fedora/CentOS/RHEL RPMs from <ulink url="http://rpmfusion.org/">RPMFusion</ulink>.
-</para>
-<para>
-If you choose to build from source, you do not need all of FAAD2 to decode
-AAC files, libfaad is enough. Build it like this:
-<screen>
-cd faad2/
-sh bootstrap
-./configure
-cd libfaad
-make
-make install
-</screen>
-</para>
-</sect2>
-
-<!-- ********** -->
-
<sect2 id="amr">
<title>AMR</title>
diff --git a/DOCS/xml/es/install.xml b/DOCS/xml/es/install.xml
index a940d94cd5..13be8f993c 100644
--- a/DOCS/xml/es/install.xml
+++ b/DOCS/xml/es/install.xml
@@ -648,41 +648,6 @@ tengan el mismo origen.
</procedure>
</sect2>
-<!-- ********** -->
-
-<sect2 id="aac">
-<title>AAC</title>
-<para>
-AAC (Codificación Avanzada de Audio) es un codec de audio que algunas veces
-se encuentra en archivos MOV y MP4. Un decodificador llamado FAAD de código
-abierto está disponible en
-<ulink url="http://www.audiocoding.com"/>.
-<application>MPlayer</application> incluye libfaad 2.0RC1, por lo que no
-necesita obtenerlo por separado.
-</para>
-
-<para>
-Si usa gcc 3.2 y falla al compilar nuestro FAAD interno o desea usar la
-biblioteca externa por alguna otra razón, descargue la biblioteca desde la
-<ulink url="http://www.audiocoding.com/download.php">página de descargas</ulink>
-y pase la opción <option>--enable-external-faad</option> a <filename>configure</filename>.