summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-03-12 11:55:01 +0000
committerUoti Urpala <uau@mplayer2.org>2011-04-13 03:17:05 +0300
commit3cb235736ea9655419386542c59fdc77be7042c5 (patch)
treeb401b9a914618771a7f26d0e73e48878f433a8ed /etc
parente43e0de9e629c780bfe14af50c4c48b220495de4 (diff)
downloadmpv-3cb235736ea9655419386542c59fdc77be7042c5.tar.bz2
mpv-3cb235736ea9655419386542c59fdc77be7042c5.tar.xz
codecs.conf: Use fourcc instead of format where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33077 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf120
1 files changed, 60 insertions, 60 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index ee758d6037..433798b1bd 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3558,45 +3558,45 @@ audiocodec wma9spdshow
audiocodec ffqdm2
info "FFmpeg QDM2 audio"
status working
- format 0x324D4451 ; "QDM2"
+ fourcc QDM2
driver ffmpeg
dll "qdm2"
audiocodec qdmc
info "QuickTime QDMC/QDM2 audio"
status working
- format 0x324D4451 ; "QDM2"
- format 0x434D4451 ; "QDMC"
+ fourcc QDM2
+ fourcc QDMC
driver qtaudio
dll "QuickTime.qts"
audiocodec ffqclp
info "FFmpeg QCLP audio"
status working
- format 0x706C6351 ; "Qclp"
- format 0x70637173 ; "sqcp"
- format 0x716C6351 ; "Qclq"
+ fourcc Qclp
+ fourcc sqcp
+ fourcc Qclq
driver ffmpeg
dll "qcelp"
audiocodec qclp
info "QuickTime QCLP audio"
status working
- format 0x706C6351 ; "Qclp"
+ fourcc Qclp
driver qtaudio
dll "QuickTime.qts"
audiocodec qtmace3
info "QuickTime MACE3 audio"
status working
- format 0x3343414D ; "MAC3"
+ fourcc MAC3
driver qtaudio
dll "QuickTime.qts"
audiocodec qtmace6
info "QuickTime MACE6 audio"
status working
- format 0x3643414D ; "MAC6"
+ fourcc MAC6
driver qtaudio
dll "QuickTime.qts"
@@ -3610,29 +3610,29 @@ audiocodec zygoaudio
audiocodec ffra144
info "FFmpeg RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
- format 0x4A63706C ; "lpcJ"
+ fourcc 14_4
+ fourcc lpcJ
driver ffmpeg
dll "real_144"
audiocodec ffra288
info "FFmpeg RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver ffmpeg
dll "real_288"
audiocodec ffcook
info "FFmpeg COOK audio"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver ffmpeg
dll "cook"
audiocodec ffatrc
info "FFmpeg Atrac 3 audio"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
format 0x270 ; atrac3 in wav
driver ffmpeg
dll "atrac3"
@@ -3640,7 +3640,7 @@ audiocodec ffatrc
audiocodec ffsipr
info "FFmpeg Sipr/Acelp.net audio"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
format 0x130 ; acelp.net
driver ffmpeg
dll "sipr"
@@ -3648,42 +3648,42 @@ audiocodec ffsipr
audiocodec ra144
info "RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
+ fourcc 14_4
driver realaud
dll "14_4.so.6.0"
audiocodec ra144win
info "Win32 RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
+ fourcc 14_4
driver realaud
dll "14_43260.dll"
audiocodec ra144mac
info "Mac OS X RealAudio 1.0"
status working
- format 0x345F3431 ; "14_4"
+ fourcc 14_4
driver realaud
dll "14_4.shlb"
audiocodec ra288
info "RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver realaud
dll "28_8.so.6.0"
audiocodec ra288win
info "Win32 RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver realaud
dll "28_83260.dll"
audiocodec ra288mac
info "Mac OS X RealAudio 2.0"
status working
- format 0x385F3832 ; "28_8"
+ fourcc 28_8
driver realaud
dll "28_8.shlb"
@@ -3691,14 +3691,14 @@ audiocodec ra10cook
info "RealPlayer 10 COOK audio"
comment "supports cook 5.1"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.so"
audiocodec racook
info "RealAudio COOK"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.so.6.0"
@@ -3706,91 +3706,91 @@ audiocodec ra10cookwin
info "Win32 RealAudio 10 COOK"
comment "supports cook 5.1"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.dll"
audiocodec racookwin
info "Win32 RealAudio COOK"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook3260.dll"
audiocodec racookmac
info "Mac OS X RealAudio COOK"
status working
- format 0x6B6F6F63 ; "cook"
+ fourcc cook
driver realaud
dll "cook.bundle/Contents/MacOS/cook"
audiocodec rasipr
info "RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.so.6.0"
audiocodec ra10sipr
info "RealPlayer 10 RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.so"
audiocodec ra10siprwin
info "Win32 RealAudio 10 Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.dll"
audiocodec rasiprwin
info "Win32 RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr3260.dll"
audiocodec rasiprmac
info "Mac OS X RealAudio Sipro"
status working
- format 0x72706973 ; "sipr"
+ fourcc sipr
driver realaud
dll "sipr.bundle/Contents/MacOS/sipr"
audiocodec raatrc
info "RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.so.6.0"
audiocodec ra10atrc
info "RealPlayer 10 RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.so"
audiocodec ra10atrcwin
info "Win32 RealAudio 10 ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.dll"
audiocodec raatrcwin
info "Win32 RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc3260.dll"
audiocodec raatrcmac
info "Mac OS X RealAudio ATRAC3"
status working
- format 0x63727461 ; "atrc"
+ fourcc atrc
driver realaud
dll "atrc.bundle/Contents/MacOS/atrc"
@@ -3811,7 +3811,7 @@ audiocodec ffadpcmimaamv
audiocodec ffadpcmimaqt
info "FFmpeg QT IMA ADPCM audio"
status working
- format 0x34616d69 ; "ima4" (MOV files)
+ fourcc ima4 ; (MOV files)
driver ffmpeg
dll adpcm_ima_qt
@@ -3828,7 +3828,7 @@ audiocodec imaadpcm
info "IMA ADPCM"
status working
format 0x11
- format 0x34616d69 ; "ima4" (MOV files)
+ fourcc ima4 ; (MOV files)
format 0x1100736d ; "ms\x00\x11" (MOV files)
driver imaadpcm
@@ -4124,20 +4124,20 @@ audiocodec pcm
format 0x1
format 0x3 ; IEEE float
format 0xfffe ; Extended
- format 0x20776172 ; "raw " (MOV files)
- format 0x736f7774 ; "twos" (MOV files)
- format 0x74776f73 ; "sowt" (MOV files)
- format 0x32336c66 ; "fl32" (MOV files)
- format 0x666c3332 ; "23lf" (MOV files)
-; format 0x34366c66 ; "fl64" (MOV files)
-; format 0x666c3634 ; "46lf" (MOV files)
- format 0x454e4f4e ; "NONE" (MOV files from Kodak CX6320)
- format 0x34326e69 ; "in24" (MOV files)
- format 0x696e3234 ; "42ni" (MOV files)
- format 0x32336e69 ; "in32" (MOV files)
- format 0x696e3332 ; "23ni" (MOV files)
- format 0x6D63706C ; "lpcm" (MOV files)
- format 0x32334C46 ; 'FL32" (aiff files)
+ fourcc "raw " ; (MOV files)
+ fourcc twos ; (MOV files)
+ fourcc sowt ; (MOV files)
+ fourcc fl32 ; (MOV files)
+ fourcc 23lf ; (MOV files)
+; fourcc fl64 ; (MOV files)
+; fourcc 46lf ; (MOV files)
+ fourcc NONE ; (MOV files from Kodak CX6320)
+ fourcc in24 ; (MOV files)
+ fourcc 42ni ; (MOV files)
+ fourcc in32 ; (MOV files)
+ fourcc 23ni ; (MOV files)
+ fourcc lpcm ; (MOV files)
+ fourcc FL32 ; (aiff files)
;;;; these are for hardware support only: (alaw,ulaw,ima-adpcm,mpeg,ac3)
; format 0x6
; format 0x7
@@ -4354,7 +4354,7 @@ audiocodec imaadpcmacm
audiocodec ffgsm
info "FFmpeg GSM 06.10"
status working
- format 0x204D5347
+ fourcc "GSM "
format 0x1500
fourcc agsm
driver ffmpeg
@@ -4371,7 +4371,7 @@ audiocodec ffgsmms
audiocodec libgsm
info "libgsm GSM 06.10"
status working
- format 0x204D5347
+ fourcc "GSM "
format 0x1500
driver ffmpeg
dll "libgsm"
@@ -4404,14 +4404,14 @@ audiocodec alaw
info "aLaw"
status working
format 0x6
- format 0x77616C61 ; 'alaw', .mov files
+ fourcc alaw ; (MOV files)
driver alaw
audiocodec ulaw
info "uLaw"
status working
format 0x7
- format 0x77616c75 ; "ulaw" (MOV files)
+ fourcc ulaw ; (MOV files)
format 0x6c75
driver alaw
@@ -4441,8 +4441,8 @@ audiocodec ffac3
info "FFmpeg AC-3"
status working
format 0x2000
- format 0x332D6361 ; ac-3 in mp4
- format 0x332D4341
+ fourcc ac-3 ; ac-3 in mp4
+ fourcc AC-3
format 0x20736D ; "ms\20" older ac3 fcc (MOV files)
fourcc dnet
fourcc sac3
@@ -4462,8 +4462,8 @@ audiocodec a52
info "AC3-liba52"
status working
format 0x2000
- format 0x332D6361 ; ac-3 in mp4
- format 0x332D4341
+ fourcc ac-3 ; ac-3 in mp4
+ fourcc AC-3
format 0x20736D ; "ms\20" older ac3 fcc (MOV files)
fourcc dnet
fourcc sac3