From d1ec4a57bab7eb2cb1cb44b9e8951c7fead025df Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 27 Jan 2010 19:15:49 +0000 Subject: Make mp3lib the default MP3 decoder again, it is a good bit faster on standard desktop hardware. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30445 b3059339-0415-0410-9bf9-f77b7e298cf2 --- etc/codecs.conf | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/etc/codecs.conf b/etc/codecs.conf index bf344dcac1..d018d2d0a2 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4029,6 +4029,23 @@ 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 ffmp3on4 info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio" status working @@ -4068,20 +4085,6 @@ audiocodec ffmp2 driver ffmpeg dll "mp2" -audiocodec mp3 - 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 mad info "libMAD MPEG layer 1-2-3" status working -- cgit v1.2.3