Mercurial > mplayer.hg

changeset 35167:f2b81cd25817

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove outdated references to mp3lib and tremor.
author reimar
date Sun, 21 Oct 2012 12:18:58 +0000
parents 3b50a42ee737
children 627bdd8915ca
files .gitignore Copyright DOCS/tech/Doxyfile DOCS/tech/MAINTAINERS DOCS/tech/TODO DOCS/tech/general.txt DOCS/xml/en/ports.xml debian/copyright
diffstat 8 files changed, 3 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/.gitignore	Sun Oct 21 12:14:19 2012 +0000
+++ b/.gitignore	Sun Oct 21 12:18:58 2012 +0000
@@ -32,8 +32,6 @@
 libvo/aspecttest
 loader/qtx/list
 loader/qtx/qtxload
-mp3lib/test
-mp3lib/test2
 TOOLS/alaw-gen
 TOOLS/alaw.dat
 TOOLS/alaw.out
--- a/Copyright	Sun Oct 21 12:14:19 2012 +0000
+++ b/Copyright	Sun Oct 21 12:18:58 2012 +0000
@@ -65,24 +65,6 @@
 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/
--- a/DOCS/tech/Doxyfile	Sun Oct 21 12:14:19 2012 +0000
+++ b/DOCS/tech/Doxyfile	Sun Oct 21 12:18:58 2012 +0000
@@ -573,7 +573,6 @@
                          libdvdnav \
                          libdvdread4 \
                          libmpeg2 \
-                         mp3lib \
                          stream/freesdp \
                          stream/librtsp \
                          stream/realrtsp \
--- a/DOCS/tech/MAINTAINERS	Sun Oct 21 12:14:19 2012 +0000
+++ b/DOCS/tech/MAINTAINERS	Sun Oct 21 12:18:58 2012 +0000
@@ -91,7 +91,6 @@
 Imported libs/projects:
     * FFmpeg: Michael Niedermayer
     * VIDIX core: Benjamin Zores
-    * mp3lib: None
     * loader: None
     * libmpeg2: None
     * libdvdcss: Diego Biurrun
--- a/DOCS/tech/TODO	Sun Oct 21 12:14:19 2012 +0000
+++ b/DOCS/tech/TODO	Sun Oct 21 12:18:58 2012 +0000
@@ -85,4 +85,3 @@
 
 remove externals:
 - remove libmpeg2 when ffmpeg12 is faster
-- remove mp3lib when ffmp3 is faster
--- a/DOCS/tech/general.txt	Sun Oct 21 12:14:19 2012 +0000
+++ b/DOCS/tech/general.txt	Sun Oct 21 12:18:58 2012 +0000
@@ -196,7 +196,7 @@
            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
--- a/DOCS/xml/en/ports.xml	Sun Oct 21 12:14:19 2012 +0000
+++ b/DOCS/xml/en/ports.xml	Sun Oct 21 12:18:58 2012 +0000
@@ -186,8 +186,8 @@
 (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.
--- a/debian/copyright	Sun Oct 21 12:14:19 2012 +0000
+++ b/debian/copyright	Sun Oct 21 12:18:58 2012 +0000
@@ -72,42 +72,6 @@
 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/