[MPlayer-cvslog] r35259 - in trunk: Makefile configure etc/codecs.conf libmpcodecs/ad.c libmpcodecs/ad_mp3lib.c libmpcodecs/ad_mp3lib.h mp3lib
reimar
subversion at mplayerhq.hu
Sun Oct 21 14:10:38 CEST 2012
Author: reimar
Date: Sun Oct 21 14:10:38 2012
New Revision: 35259
Log:
Remove our internal mp3lib copy.
We have FFmpeg as integrated decoder, and the
external mpg123 library should include all important
improvements from our mp3lib and is actually properly
maintained.
Deleted:
trunk/libmpcodecs/ad_mp3lib.c
trunk/libmpcodecs/ad_mp3lib.h
trunk/mp3lib/
Modified:
trunk/Makefile
trunk/configure
trunk/etc/codecs.conf
trunk/libmpcodecs/ad.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sun Oct 21 13:14:13 2012 (r35258)
+++ trunk/Makefile Sun Oct 21 14:10:38 2012 (r35259)
@@ -164,21 +164,6 @@ SRCS_COMMON-$(MACOSX_FINDER) +=
SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c
SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c
-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \
- mp3lib/dct64_3dnow.c
-SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \
- mp3lib/dct64_k7.c
-SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c
-SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \
- $(SRCS_MP3LIB-X86-yes)
-SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c
-SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c
-SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c
-SRCS_MP3LIB += mp3lib/sr1.c \
- $(SRCS_MP3LIB-yes)
-SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \
- $(SRCS_MP3LIB)
-
SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
libmpdemux/demux_mpc.c
SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
@@ -1035,9 +1020,7 @@ LOADER_TEST_OBJS = $(SRCS_WIN32_EMULATIO
loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g
loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS)
-mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS)
-
-TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2
+TESTS = codecs2html codec-cfg-test libvo/aspecttest
ifdef ARCH_X86_32
TESTS += loader/qtx/list loader/qtx/qtxload
Modified: trunk/configure
==============================================================================
--- trunk/configure Sun Oct 21 13:14:13 2012 (r35258)
+++ trunk/configure Sun Oct 21 14:10:38 2012 (r35259)
@@ -449,7 +449,6 @@ Codecs:
--disable-twolame disable Twolame (MPEG layer 2) encoding [autodetect]
--enable-xmms enable XMMS input plugin support [disabled]
--enable-libdca enable libdca support [autodetect]
- --disable-mp3lib disable builtin mp3lib [autodetect]
--disable-liba52 disable liba52 [autodetect]
--disable-libmpeg2 disable libmpeg2 [autodetect]
--disable-libmpeg2-internal disable builtin libmpeg2 [autodetect]
@@ -757,7 +756,6 @@ _speex=auto
_libgsm=auto
_theora=auto
_mpg123=auto
-_mp3lib=auto
_liba52=auto
_libdca=auto
_libmpeg2=auto
@@ -1156,8 +1154,6 @@ for ac_option do
--disable-theora) _theora=no ;;
--enable-mpg123) _mpg123=yes ;;
--disable-mpg123) _mpg123=no ;;
- --enable-mp3lib) _mp3lib=yes ;;
- --disable-mp3lib) _mp3lib=no ;;
--enable-liba52) _liba52=yes ;;
--disable-liba52) _liba52=no ;;
--enable-libdca) _libdca=yes ;;
@@ -6410,19 +6406,6 @@ else
fi
echores "$_theora"
-echocheck "mp3lib support"
-if test "$_mp3lib" = auto ; then
- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes
-fi
-if test "$_mp3lib" = yes ; then
- def_mp3lib='#define CONFIG_MP3LIB 1'
- codecmodules="mp3lib(internal) $codecmodules"
-else
- def_mp3lib='#undef CONFIG_MP3LIB'
- nocodecmodules="mp3lib(internal) $nocodecmodules"
-fi
-echores "$_mp3lib"
-
# Any version of libmpg123 that knows MPG123_RESYNC_LIMIT shall be fine.
# That is, 1.2.0 onwards. Recommened is 1.14 onwards, though.
echocheck "mpg123 support"
@@ -8251,7 +8234,6 @@ MD5SUM = $_md5sum
MGA = $_mga
MNG = $_mng
MP3LAME = $_mp3lame
-MP3LIB = $_mp3lib
MPG123 = $_mpg123
MUSEPACK = $_musepack
NAS = $_nas
@@ -8636,7 +8618,6 @@ $def_mad
$def_mp3lame
$def_mp3lame_preset
$def_mp3lame_preset_medium
-$def_mp3lib
$def_mpg123
$def_musepack
$def_speex
Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf Sun Oct 21 13:14:13 2012 (r35258)
+++ trunk/etc/codecs.conf Sun Oct 21 14:10:38 2012 (r35259)
@@ -5048,25 +5048,10 @@ audiocodec ffsonic
driver ffmpeg
dll "sonic"
-audiocodec mp3
- ; this is preferred over ffmp2/ffmp3 since it is faster due to using
- ; floating point and there are even broken mkv files where the audio
- ; needs to be parsed, making this codec work more reliably
- info "mp3lib MPEG layer-2, layer-3"
- status buggy
- comment "Barely maintained, miscompiles with newer gcc versions"
- format 0x50 ; layer-1 && layer-2
- format 0x55 ; layer-3
- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files)
- format 0x55005354 ; broken file
- fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
- fourcc "MP3 " ; used in .nsv files
- fourcc "LAME" ; used in mythtv .nuv files
- driver mp3lib
-
audiocodec mpg123
; this is preferred over ffmp2/ffmp3 since it is faster, generally
+ ; and there are even broken mkv files where the audio
+ ; needs to be parsed, making this codec work more reliably
info "MPEG 1.0/2.0/2.5 layers I, II, III"
status working
comment "High-performance decoder using libmpg123."
Modified: trunk/libmpcodecs/ad.c
==============================================================================
--- trunk/libmpcodecs/ad.c Sun Oct 21 13:14:13 2012 (r35258)
+++ trunk/libmpcodecs/ad.c Sun Oct 21 14:10:38 2012 (r35259)
@@ -66,9 +66,6 @@ const ad_functions_t * const mpcodecs_ad
#ifdef CONFIG_MPG123
&mpcodecs_ad_mpg123,
#endif
-#ifdef CONFIG_MP3LIB
- &mpcodecs_ad_mp3lib,
-#endif
#ifdef CONFIG_LIBA52
&mpcodecs_ad_liba52,
#endif
More information about the MPlayer-cvslog
mailing list