diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-10 19:37:42 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-10 19:37:42 +0000 |
| commit | f10f9b572622a6d2aced91c56b508209054218a8 (patch) | |
| tree | 50e4d9fc630a45c1a3b996a561bfaca81a8e6e7a /etc | |
| parent | 4e50b6df73fd6aa3e426aba796f38b9357ea457b (diff) | |
| download | mpv-f10f9b572622a6d2aced91c56b508209054218a8.tar.bz2 mpv-f10f9b572622a6d2aced91c56b508209054218a8.tar.xz | |
Move mp3lib priority below libavcodec mp2/mp3 audio decoders.
This is meant as a test to see if we can possibly remove mp3lib at some point.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30265 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 3b065b7e05..68db517ab6 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3967,20 +3967,6 @@ audiocodec msadpcmacm driver acm dll "msadp32.acm" -audiocodec mp3 - info "mp3lib MPEG layer-2, layer-3" - status working - comment "Optimized to MMX/SSE/3Dnow!" - format 0x50 ; layer-1 && layer-2 - format 0x55 ; layer-3 - format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) - format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) - format 0x55005354 ; broken file - fourcc ".mp3" ; CBR/VBR MP3 (MOV files) - fourcc "MP3 " ; used in .nsv files - fourcc "LAME" ; used in mythtv .nuv files - driver mp3lib - audiocodec ffpcmdaud info "D-Cinema audio (FFmpeg)" status untested @@ -4065,11 +4051,26 @@ audiocodec ffmp2 comment "integer only" status working format 0x50 + format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) fourcc ".mp2" ; MP2 (MOV files) fourcc ".mp1" ; MP1 (MOV files) driver ffmpeg dll "mp2" +audiocodec mp3 + info "mp3lib MPEG layer-2, layer-3" + status working + comment "Optimized to MMX/SSE/3Dnow!" + format 0x50 ; layer-1 && layer-2 + format 0x55 ; layer-3 + format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) + format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) + format 0x55005354 ; broken file + fourcc ".mp3" ; CBR/VBR MP3 (MOV files) + fourcc "MP3 " ; used in .nsv files + fourcc "LAME" ; used in mythtv .nuv files + driver mp3lib + audiocodec mad info "libMAD MPEG layer 1-2-3" status working |