[MPlayer-cvslog] r30445 - trunk/etc/codecs.conf

[reimar]

Author: reimar
Date: Wed Jan 27 20:15:49 2010
New Revision: 30445

Log:
Make mp3lib the default MP3 decoder again, it is a good bit faster on
standard desktop hardware.

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Jan 27 19:23:19 2010	(r30444)
+++ trunk/etc/codecs.conf	Wed Jan 27 20:15:49 2010	(r30445)
@@ -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