Mercurial > mplayer.hg

changeset 30876:9283a5a007f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prefer FFmpeg AAC decoder over libfaad. This is a tentative change to give the decoder more testing; it can always be reverted in short order if it turns out suboptimal.
author diego
date Wed, 17 Mar 2010 12:39:21 +0000
parents 4a65ead91a7e
children 447a58cf1611
files etc/codecs.conf
diffstat 1 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Wed Mar 17 12:35:36 2010 +0000
+++ b/etc/codecs.conf	Wed Mar 17 12:39:21 2010 +0000
@@ -3902,22 +3902,6 @@
   driver ffmpeg
   dll "dvaudio"
 
-audiocodec faad
-  info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
-  status working
-  fourcc mp4a,MP4A
-  fourcc "VLB " ; Used in NSV, not really working
-  fourcc "AAC " ; Used in NSV
-  fourcc "AACP" ; Used in NSV for AACPlus
-  fourcc raac,racp
-  format 0xff
-  format 0x706D
-  format 0x4143 ; aac in asf
-  format 0xA106 ; aac in avi
-  format 0xAAC0 ; Borgtech nonsense tag
-  driver faad
-  dll libfaad2
-
 audiocodec ffaac
   info "FFmpeg AAC (MPEG-2/MPEG-4 Audio)"
   status working
@@ -4005,6 +3989,22 @@
   driver ffmpeg
   dll "nellymoser"
 
+audiocodec faad
+  info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
+  status working
+  fourcc mp4a,MP4A
+  fourcc "VLB " ; Used in NSV, not really working
+  fourcc "AAC " ; Used in NSV
+  fourcc "AACP" ; Used in NSV for AACPlus
+  fourcc raac,racp
+  format 0xff
+  format 0x706D
+  format 0x4143 ; aac in asf
+  format 0xA106 ; aac in avi
+  format 0xAAC0 ; Borgtech nonsense tag
+  driver faad
+  dll libfaad2
+
 audiocodec pcm
   info "Uncompressed PCM"
   status working