diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:37:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-30 15:37:34 +0300 |
| commit | a286506467e179010c23381c6ca01f29c0071dc6 (patch) | |
| tree | 1f3c7eac06e4ae03d5b6a2d6773d96bcd7e5fcbd /etc | |
| parent | 36cce813534bcb24a391c500ab9572e56b49923b (diff) | |
| parent | 0a33fdb83a5488744e3a148d1a09801850135a56 (diff) | |
| download | mpv-a286506467e179010c23381c6ca01f29c0071dc6.tar.bz2 mpv-a286506467e179010c23381c6ca01f29c0071dc6.tar.xz | |
Merge svn changes up to r31176
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index a2d384bd15..b132f40d9e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4131,6 +4131,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 @@ -4138,6 +4145,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" @@ -4151,6 +4171,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" @@ -4159,6 +4187,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" |