summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-21 11:00:47 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-21 11:00:47 +0000
commite9e576a0a6c0a762b72187912a8ef680cb6a7108 (patch)
tree6b833d2ce3fa54eb031faf292035f3d67ce39676 /etc
parent96a6782c4333b360be43b323a87c43ae8403d7f6 (diff)
downloadmpv-e9e576a0a6c0a762b72187912a8ef680cb6a7108.tar.bz2
mpv-e9e576a0a6c0a762b72187912a8ef680cb6a7108.tar.xz
Add support for AAC decoding through FFmpeg; libfaad is preferred for now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf12
1 files changed, 12 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index b10879066d..5f24280c69 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2981,6 +2981,18 @@ audiocodec faad
driver faad
dll libfaad2
+audiocodec ffaac
+ info "FFmpeg AAC (MPEG-2/MPEG-4 Audio) decoder"
+ 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
+ format 0xff
+ format 0x706D
+ driver ffmpeg
+ dll aac
+
audiocodec ffflac
info "FFmpeg FLAC audio decoder"
status working