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