summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-17 12:39:21 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-03-17 12:39:21 +0000
commit3cd1525bf3e13cf88823fd522a6315790d2b5175 (patch)
tree982db61e32e5f179b70cea7815f1189b2b7ef26c /etc
parent0426d5d72df81217f32147d039f3eb29c009af12 (diff)
downloadmpv-3cd1525bf3e13cf88823fd522a6315790d2b5175.tar.bz2
mpv-3cd1525bf3e13cf88823fd522a6315790d2b5175.tar.xz
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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30918 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf32
1 files changed, 16 insertions, 16 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 01b3b5a086..73a3bc3257 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3902,22 +3902,6 @@ audiocodec ffdv
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 @@ audiocodec ffnellymoser
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