summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-07-29 21:34:22 +0200
committerwm4 <wm4@nowhere>2012-07-30 01:45:08 +0200
commitc8b0f2115447f2fdd5bb8090d06153a4bf72d9ff (patch)
tree9cc38c0edc8c7202cfeaef6ea11f5c2ab4cd0c1e /etc
parent5b9d01bd496e6143ce64b4de9a3d0340eb699301 (diff)
downloadmpv-c8b0f2115447f2fdd5bb8090d06153a4bf72d9ff.tar.bz2
mpv-c8b0f2115447f2fdd5bb8090d06153a4bf72d9ff.tar.xz
codecs: prefer libmad over libmpg123
Someone on the internet once told me that MAD is the best mp3 decoder (and better than mpg123), so he must be right. I used to force mad in my config file, but now I'm annoyed by the line "Forced audio codec" that goes along with it. Because I think that message is necessary and needed to discourage users from doing stupid things, but I still want to get rid of this message, I'm simply moving MAD up in the codec selection order. (Please look away.)
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf24
1 files changed, 12 insertions, 12 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 8f0220fece..5120406f12 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4217,6 +4217,18 @@ 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"
@@ -4314,18 +4326,6 @@ 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