summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-21 21:38:16 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-09-21 21:38:16 +0000
commitc8f24c22a60335f3df6ea82113868b210eb64414 (patch)
treec61e6a019390ccfe62b71d3cbeb6af1e22fc7214 /etc
parentffe1e2c3e3bef206f6660b049c4df5173fbb934f (diff)
downloadmpv-c8f24c22a60335f3df6ea82113868b210eb64414.tar.bz2
mpv-c8f24c22a60335f3df6ea82113868b210eb64414.tar.xz
added ffmp3, fixed mp3 comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1929 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf13
1 files changed, 11 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 282fd1d223..6ed12d055b 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -457,17 +457,26 @@ audiocodec msadpcm
audiocodec mp3
info "MPEG layer-2, layer-3"
status working
- comment "Optimized to AMD 3Dnow!"
+ comment "Optimized to MMX/SSE/3Dnow!"
format 0x50
format 0x55
driver mp3lib
dll "mp3lib (mpglib)"
flags seekable
+audiocodec ffmp3
+ info "FFmpeg layer-123 audio decoder - integer only"
+ status working
+ format 0x50
+ format 0x55
+ driver ffmpeg
+ dll "mpegaudio"
+ flags seekable
+
audiocodec mp3acm
info "MPEG layer-3"
status working
- comment "Optimized to Intel MMX/SSE, conflicts with security kernel patches"
+ comment "conflicts with security kernel patches"
format 0x55
driver acm
dll "l3codeca.acm"