summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-14 14:24:16 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-14 14:24:16 +0000
commitb6bcfb4f006c81980e8c16127e7a516cfa89a6fb (patch)
tree27a15a7ef4de60c1c709af36e65b2f27decdf339 /etc
parent2b26048ccaf9a71d552e147b623f270422e56730 (diff)
downloadmpv-b6bcfb4f006c81980e8c16127e7a516cfa89a6fb.tar.bz2
mpv-b6bcfb4f006c81980e8c16127e7a516cfa89a6fb.tar.xz
Enable libavcodecs new MPEG-1 Audio float decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31175 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf39
1 files changed, 39 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 2f4b1ad656..aefb741985 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4132,6 +4132,13 @@ audiocodec mp3
fourcc "LAME" ; used in mythtv .nuv files
driver mp3lib
+audiocodec ffmp3on4float
+ info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio"
+ status working
+ format 0x1d61346d ; 'm','4','a',29 internal MPlayer fourcc
+ driver ffmpeg
+ dll "mp3on4float"
+
audiocodec ffmp3on4
info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio"
status working
@@ -4139,6 +4146,19 @@ audiocodec ffmp3on4
driver ffmpeg
dll "mp3on4"
+audiocodec ffmp3float
+ info "FFmpeg MPEG layer-3 audio"
+ comment "integer only"
+ status working
+ format 0x55
+ format 0x5500736d ; "ms\0\x55" older mp3 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 ffmpeg
+ dll "mp3float"
+
audiocodec ffmp3
info "FFmpeg MPEG layer-3 audio"
comment "integer only"
@@ -4152,6 +4172,14 @@ audiocodec ffmp3
driver ffmpeg
dll "mp3"
+audiocodec ffmp3adufloat
+ info "FFmpeg MPEG layer-3 adu audio"
+ comment "integer only"
+ status working
+ format 0x55756461 ; 'a','d','u',0x55 internal MPlayer fourcc
+ driver ffmpeg
+ dll "mp3adufloat"
+
audiocodec ffmp3adu
info "FFmpeg MPEG layer-3 adu audio"
comment "integer only"
@@ -4160,6 +4188,17 @@ audiocodec ffmp3adu
driver ffmpeg
dll "mp3adu"
+audiocodec ffmp2float
+ info "FFmpeg MPEG layer-1 and layer-2 audio"
+ 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 "mp2float"
+
audiocodec ffmp2
info "FFmpeg MPEG layer-1 and layer-2 audio"
comment "integer only"