Mercurial > mplayer.hg

changeset 32990:47814982af74

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use fourcc instead of format where appropriate.
author cehoyos
date Sat, 12 Mar 2011 11:55:01 +0000
parents 221d00deafec
children 90a7ab80c951
files etc/codecs.conf
diffstat 1 files changed, 60 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Mar 12 10:55:33 2011 +0000
+++ b/etc/codecs.conf	Sat Mar 12 11:55:01 2011 +0000
@@ -3604,45 +3604,45 @@
 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"
 
@@ -3656,29 +3656,29 @@
 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"
@@ -3686,7 +3686,7 @@
 audiocodec ffsipr
   info "FFmpeg Sipr/Acelp.net audio"
   status working
-  format 0x72706973 ; "sipr"
+  fourcc sipr
   format 0x130 ; acelp.net
   driver ffmpeg
   dll "sipr"
@@ -3694,42 +3694,42 @@
 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"
 
@@ -3737,14 +3737,14 @@
   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"
 
@@ -3752,91 +3752,91 @@
   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"
 
@@ -3857,7 +3857,7 @@
 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
 
@@ -3874,7 +3874,7 @@
   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
 
@@ -4170,20 +4170,20 @@
   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
@@ -4417,7 +4417,7 @@
 audiocodec ffgsm
   info "FFmpeg GSM 06.10"
   status working
-  format 0x204D5347
+  fourcc "GSM "
   format 0x1500
   fourcc agsm
   driver ffmpeg
@@ -4434,7 +4434,7 @@
 audiocodec libgsm
   info "libgsm GSM 06.10"
   status working
-  format 0x204D5347
+  fourcc "GSM "
   format 0x1500
   driver ffmpeg
   dll "libgsm"
@@ -4467,14 +4467,14 @@
   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
 
@@ -4504,8 +4504,8 @@
   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
@@ -4525,8 +4525,8 @@
   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