summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-28 00:54:08 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-28 00:54:08 +0200
commitd84685ce13c7b31689b257e44b780373c91f8d32 (patch)
treea16cf570b42d8aed52a42a385d7a27ee36551e98 /etc
parent79ab199322a7070c489eca842e472d15be02412c (diff)
parent9b6b3ff08c3f0c5151a379cabd08cfb0fa309f79 (diff)
downloadmpv-d84685ce13c7b31689b257e44b780373c91f8d32.tar.bz2
mpv-d84685ce13c7b31689b257e44b780373c91f8d32.tar.xz
Merge svn changes up to r30448
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf32
1 files changed, 18 insertions, 14 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 3496604e49..d018d2d0a2 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3978,20 +3978,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
@@ -4043,6 +4029,23 @@ audiocodec ffsonic
driver ffmpeg
dll "sonic"
+audiocodec mp3
+ ; this is preferred over ffmp2/ffmp3 since it is faster due to using
+ ; floating point and there are even broken mkv files where the audio
+ ; needs to be parsed, making this codec work more reliably
+ 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 ffmp3on4
info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio"
status working
@@ -4076,6 +4079,7 @@ 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