summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaf <jaf@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-21 22:53:16 +0000
committerjaf <jaf@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-21 22:53:16 +0000
commitfe08c0b7cd8c6d0e3156dc5b6c4657937109c0e7 (patch)
tree5c780578626907a54fbd45c153090b9c8e5125bf
parente5833bde5002abe9469a27517d71c59e1492c023 (diff)
downloadmpv-fe08c0b7cd8c6d0e3156dc5b6c4657937109c0e7.tar.bz2
mpv-fe08c0b7cd8c6d0e3156dc5b6c4657937109c0e7.tar.xz
0x50 is not playbackable (minimum only sample), prefer ffmpX to mad, ffmpeg is more often installed then mad. maybe anybody should change the sound-code to automatic try the next codec if it is not playbackable (e.g. mad not installed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7467 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf27
1 files changed, 14 insertions, 13 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index b2692b082b..cfcd3060ff 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1229,7 +1229,7 @@ audiocodec mp3
info "mp3lib MPEG layer-2, layer-3"
status working
comment "Optimized to MMX/SSE/3Dnow!"
- format 0x50
+# format 0x50 ; seams to be Layer 1 (or also 2?)
format 0x55
format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
@@ -1237,18 +1237,6 @@ audiocodec mp3
dll "mp3lib"
flags seekable
-;MAD library
-audiocodec mad
- info "libMAD MPEG layer 1,2,3"
- status working
- format 0x50
- format 0x55
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- driver libmad
- dll "libmad"
- flags seekable
-
audiocodec ffmp3
info "FFmpeg layer-3 audio decoder - integer only"
status working
@@ -1267,6 +1255,19 @@ audiocodec ffmp2
dll "mp2"
flags seekable
+;MAD library
+audiocodec mad
+ info "libMAD MPEG layer 1,2,3"
+ status working
+ format 0x50
+ format 0x55
+ format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
+ format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+ driver libmad
+ dll "libmad"
+ flags seekable
+
+
audiocodec mp3acm
info "MPEG layer-3"
status working