summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-04-02 07:02:43 +0300
committerUoti Urpala <uau@mplayer2.org>2011-04-02 07:28:53 +0300
commitf9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202 (patch)
tree3d369fff359296307c05e120b4d2b53ea5974928 /etc
parentb8e1456c25de18b8ecb8922d870bfe9161900d2a (diff)
downloadmpv-f9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202.tar.bz2
mpv-f9b5f2870cd7ebb8fe70eeb65e22d11bb88d5202.tar.xz
mp3lib: drop internal mp3lib tree
Delete mp3lib which has been the default mp3 decoder until now. In addition to being an unnecessary embedded library it now fails to compile correctly with the new gcc-4.6, producing noise. After the deletion the default decoder priority for mp3 will be first libmpg123 (a newer version of the code that mp3lib was based on) if available, then ffmp3float which should be available in all normal compiles. I think that some tweaking may be required as these decoder alternatives get wider testing, but any problems should be solvable and there should be no need for mp3lib.
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf17
1 files changed, 0 insertions, 17 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 5226c37197..3f624e51ee 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4220,23 +4220,6 @@ 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 working
- comment "Optimized to MMX/SSE/3Dnow!"
- 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
info "MPEG 1.0/2.0/2.5 layers I, II, III"