summaryrefslogtreecommitdiffstats
path: root/etc/codecs.conf
diff options
context:
space:
mode:
Diffstat (limited to 'etc/codecs.conf')
-rw-r--r--etc/codecs.conf24
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index e4618a92d0..ca07082839 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4160,18 +4160,6 @@ audiocodec ffsonic
driver ffmpeg
dll "sonic"
-audiocodec mad
- info "libMAD MPEG layer 1-2-3"
- status working
- format 0x50
- format 0x55
- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
- fourcc "MP3 " ; used in .nsv files
- fourcc "LAME" ; used in mythtv .nuv files
- driver libmad
- dll "libmad"
-
audiocodec mpg123
; this is preferred over ffmp2/ffmp3 since it is faster, generally
info "MPEG 1.0/2.0/2.5 layers I, II, III"
@@ -4269,6 +4257,18 @@ audiocodec ffmp2
driver ffmpeg
dll "mp2"
+audiocodec mad
+ info "libMAD MPEG layer 1-2-3"
+ status working
+ format 0x50
+ format 0x55
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+ fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+ fourcc "MP3 " ; used in .nsv files
+ fourcc "LAME" ; used in mythtv .nuv files
+ driver libmad
+ dll "libmad"
+
audiocodec mp3acm
info "MPEG layer-3"
status working