summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-25 19:24:36 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-25 19:24:36 +0000
commitb2d486231df3405d15e89feb1b17dd5f11a64df8 (patch)
tree8eacd852bf99ea75b2edb7e9fb4e8416e3c50b86 /etc
parent19395226500f05e9916794e6d517daa899838fbb (diff)
downloadmpv-b2d486231df3405d15e89feb1b17dd5f11a64df8.tar.bz2
mpv-b2d486231df3405d15e89feb1b17dd5f11a64df8.tar.xz
Unify MP3 fourccs for all decoders
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17949 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf18
1 files changed, 12 insertions, 6 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 6143b066cf..bf542fa828 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -2400,9 +2400,10 @@ audiocodec mp3
comment "Optimized to MMX/SSE/3Dnow!"
format 0x50 ; layer-1 && layer-2
format 0x55 ; layer-3
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
- format 0x2033504D ; "MP3 " (used in .nsv files)
+ fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+ fourcc "MP3 " ; used in .nsv files
+ fourcc "LAME" ; used in mythtv .nuv files
driver mp3lib
audiocodec ffpcmdaud
@@ -2460,8 +2461,10 @@ audiocodec ffmp3
comment "integer only"
status working
format 0x55
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+ fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+ fourcc "MP3 " ; used in .nsv files
+ fourcc "LAME" ; used in mythtv .nuv files
driver ffmpeg
dll "mp3"
@@ -2486,8 +2489,10 @@ audiocodec mad
status working
format 0x50
format 0x55
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files)
+ fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+ fourcc "MP3 " ; used in .nsv files
+ fourcc "LAME" ; used in mythtv .nuv files
driver libmad
dll "libmad"
@@ -2780,7 +2785,8 @@ audiocodec hwmpa
comment "for hardware MPEG audio decoders"
format 0x50 ; layer-1 && layer-2
format 0x55 ; layer-3
- format 0x33706d2e ; ".mp3" CBR/VBR MP3 (MOV files)
format 0x5500736d ; "ms\0\x55" older MP3 fourcc (MOV files)
- format 0x2033504D ; "MP3 " (used in .nsv files)
+ fourcc ".mp3" ; CBR/VBR MP3 (MOV files)
+ fourcc "MP3 " ; used in .nsv files
+ fourcc "LAME" ; used in mythtv .nuv files
driver hwmpa