summaryrefslogtreecommitdiffstats
path: root/etc/codecs.conf
diff options
context:
space:
mode:
Diffstat (limited to 'etc/codecs.conf')
-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