summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-20 13:34:54 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-20 13:34:54 +0000
commit90020a5f22ce4189c6bf7df8e73b2be8933da408 (patch)
tree4d938358f29d9c661ca158879caa1579f626cab7 /etc
parentfb61ad312c073067dff688c7faf471c4dcb65007 (diff)
downloadmpv-90020a5f22ce4189c6bf7df8e73b2be8933da408.tar.bz2
mpv-90020a5f22ce4189c6bf7df8e73b2be8933da408.tar.xz
mpegaudio->mp2+mp3 renamed in ffmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5731 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf13
1 files changed, 10 insertions, 3 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 54fc27ddae..81f496f9de 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -993,14 +993,21 @@ audiocodec mad
flags seekable
audiocodec ffmp3
- info "FFmpeg layer-123 audio decoder - integer only"
+ info "FFmpeg layer-3 audio decoder - integer only"
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 ffmpeg
- dll "mpegaudio"
+ dll "mp3"
+ flags seekable
+
+audiocodec ffmp2
+ info "FFmpeg layer-12 audio decoder - integer only"
+ status working
+ format 0x50
+ driver ffmpeg
+ dll "mp2"
flags seekable
audiocodec mp3acm