# HG changeset patch
# User diego
# Date 1268829561 0
# Node ID 9283a5a007f02be6a5c467f92972498aaf470dea
# Parent  4a65ead91a7e0a557bd35a7f867488f54292ce96
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.

diff -r 4a65ead91a7e -r 9283a5a007f0 etc/codecs.conf
--- 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