summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-11-02 14:17:05 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-08 18:03:27 +0200
commit0a2d29a75b80c003519f48bca2abbac2092bd2f6 (patch)
treeeb79a48e7451309ee9b57bcebff122e02d347995 /etc
parentffbc561f96139a187ba3f4036babd786b1321d0b (diff)
downloadmpv-0a2d29a75b80c003519f48bca2abbac2092bd2f6.tar.bz2
mpv-0a2d29a75b80c003519f48bca2abbac2092bd2f6.tar.xz
codecs.conf, mp_taglists: Support FFmpeg LATM decoding
Also move libfaad codecs.conf entry into the same position as in svn (no functionality change since ffaac is marked buggy so only faad is used by default regardless or order). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32571 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf37
1 files changed, 22 insertions, 15 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index a8c542f8e0..1a953394ef 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4011,21 +4011,12 @@ audiocodec ffdv
driver ffmpeg
dll "dvaudio"
-audiocodec faad
- info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
- status working
- fourcc mp4a,MP4A,MP4L
- 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 fflatm
+ info "FFmpeg AAC in LATM"
+ status buggy
+ fourcc "LATM" ; internal MPlayer FourCC
+ driver ffmpeg
+ dll aac_latm
audiocodec ffaac
info "FFmpeg AAC (MPEG-2/MPEG-4 Audio)"
@@ -4115,6 +4106,22 @@ audiocodec ffnellymoser
driver ffmpeg
dll "nellymoser"
+audiocodec faad
+ info "FAAD AAC (MPEG-2/MPEG-4 Audio)"
+ status working
+ fourcc mp4a,MP4A,MP4L
+ 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