Remove outdated references to mp3lib and tremor.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35261 b3059339-0415-0410-9bf9-f77b7e298cf2
pigoz · Oct 21, 2012 · 96ebfbf · 96ebfbf
1 parent a58d050
commit 96ebfbf
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 62 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,8 +32,6 @@ libdvdread4/
 libvo/aspecttest
 loader/qtx/list
 loader/qtx/qtxload
-mp3lib/test
-mp3lib/test2
 TOOLS/alaw-gen
 TOOLS/alaw.dat
 TOOLS/alaw.out

diff --git a/Copyright b/Copyright
@@ -65,24 +65,6 @@ Copyright:  1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
 License:    GNU General Public License
 
 
-Name:       mpg123
-Version:    0.59s + significant changes
-URL:        http://www.mpg123.de/
-Directory:  mp3lib
-Copyright:  1995-1999 by Michael Hipp
-            2004 Romain Dolbeau <romain@dolbeau.org>
-            2006 Zuxy Meng <zuxy.meng@gmail.com
-License:    GNU General Public License
-
-
-Name:       Tremor
-Version:    1.0 + parts CVS from December 2004 + patches
-URL:        http://xiph.org/
-Directory:  tremor
-Copyright:  1994-2002, Xiph.org Foundation http://www.xiph.org/
-License:    BSD-like, see tremor/COPYING
-
-
 Name:       avifile DLL loader
 Version:    0.47 + patches + CVS updates
 URL:        http://avifile.sourceforge.net/

diff --git a/DOCS/tech/Doxyfile b/DOCS/tech/Doxyfile
@@ -573,7 +573,6 @@ EXCLUDE                = DOCS \
                          libdvdnav \
                          libdvdread4 \
                          libmpeg2 \
-                         mp3lib \
                          stream/freesdp \
                          stream/librtsp \
                          stream/realrtsp \

diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
@@ -91,7 +91,6 @@ MPlayer code:
 Imported libs/projects:
     * FFmpeg: Michael Niedermayer
     * VIDIX core: Benjamin Zores
-    * mp3lib: None
     * loader: None
     * libmpeg2: None
     * libdvdcss: Diego Biurrun

diff --git a/DOCS/tech/TODO b/DOCS/tech/TODO
@@ -85,4 +85,3 @@ stream:
 
 remove externals:
 - remove libmpeg2 when ffmpeg12 is faster
-- remove mp3lib when ffmp3 is faster
diff --git a/DOCS/tech/general.txt b/DOCS/tech/general.txt
@@ -196,7 +196,7 @@ Now, go on:
            Only used if none of the above works.
 
 4. Codecs. Consists of libmpcodecs/* and separate files or libs,
-   for example libmpeg2, loader, mp3lib.
+   for example libmpeg2, loader.
 
    mplayer.c doesn't call them directly, but through the dec_audio.c and
    dec_video.c files, so the mplayer.c doesn't have to know anything about

diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
@@ -186,8 +186,8 @@ On <emphasis role="bold">UltraSPARCs</emphasis>,
 (equivalent to MMX), currently only in
 <systemitem class="library">libmpeg2</systemitem>,
 <systemitem class="library">libvo</systemitem>
-and <systemitem class="library">libavcodec</systemitem>, but not in
-<systemitem class="library">mp3lib</systemitem>. You can watch a VOB file
+and <systemitem class="library">libavcodec</systemitem>.
+You can watch a VOB file
 on a 400MHz CPU. You'll need
 <ulink url="http://www.sun.com/sparc/vis/mediaLib.html"><systemitem class="library">mLib</systemitem></ulink>
 installed.

diff --git a/debian/copyright b/debian/copyright
@@ -72,42 +72,6 @@ Copyright (C) 2003 David S. Miller <davem@redhat.com>
 Copyright (c) 2002-2003 Falk Hueffner <falk@debian.org>
 License:    GNU General Public License
 
-Name:       mpg123
-Version:    0.59s + significant changes
-Homepage:   http://www.mpg123.de/
-Directory:  mp3lib
-Copyright (c) 1995 by Michael Hipp
-License:    GNU General Public License
-
-Name:       Tremor
-Version:    1.0 + parts CVS from December 2004 + patches
-Homepage:   http://xiph.org/
-Directory:  tremor
-Copyright (c) 2002, Xiph.org Foundation
-License:    BSD-like:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- - Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- - Neither the name of the Xiph.org Foundation nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
- OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Name:       avifile DLL loader
 Version:    0.47 + patches + CVS updates
 Homepage:   http://avifile.sourceforge.net/