Mercurial > mplayer.hg

changeset 34072:0527645edf13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync vlc fourcc list with codecs.conf
author compn
date Thu, 29 Sep 2011 22:39:08 +0000
parents 5ff8cf4f0ad4
children ac52c68c17f5
files etc/codecs.conf
diffstat 1 files changed, 36 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Thu Sep 29 21:04:16 2011 +0000
+++ b/etc/codecs.conf	Thu Sep 29 22:39:08 2011 +0000
@@ -217,6 +217,7 @@
   fourcc hdv1,hdv2,hdv3
   fourcc hdv4,hdv5,hdv6
   fourcc hdv7,hdv8,hdv9
+  fourcc hdva,xdhd,xdh2
   fourcc xdv1,xdv2,xdv3
   fourcc xdv4,xdv5,xdv6
   fourcc xdv7,xdv8,xdv9
@@ -259,6 +260,7 @@
   fourcc hdv1,hdv2,hdv3
   fourcc hdv4,hdv5,hdv6
   fourcc hdv7,hdv8,hdv9
+  fourcc hdva,xdhd,xdh2
   fourcc xdv1,xdv2,xdv3
   fourcc xdv4,xdv5,xdv6
   fourcc xdv7,xdv8,xdv9
@@ -300,6 +302,7 @@
   fourcc hdv1,hdv2,hdv3
   fourcc hdv4,hdv5,hdv6
   fourcc hdv7,hdv8,hdv9
+  fourcc hdva,xdhd,xdh2
   fourcc xdv1,xdv2,xdv3
   fourcc xdv4,xdv5,xdv6
   fourcc xdv7,xdv8,xdv9
@@ -335,6 +338,7 @@
   fourcc hdv1,hdv2,hdv3
   fourcc hdv4,hdv5,hdv6
   fourcc hdv7,hdv8,hdv9
+  fourcc hdva,xdhd,xdh2
   fourcc xdv1,xdv2,xdv3
   fourcc xdv4,xdv5,xdv6
   fourcc xdv7,xdv8,xdv9
@@ -399,6 +403,7 @@
   fourcc hdv1,hdv2,hdv3
   fourcc hdv4,hdv5,hdv6
   fourcc hdv7,hdv8,hdv9
+  fourcc hdva,xdhd,xdh2
   fourcc xdv1,xdv2,xdv3
   fourcc xdv4,xdv5,xdv6
   fourcc xdv7,xdv8,xdv9
@@ -431,6 +436,7 @@
   fourcc hdv1,hdv2,hdv3
   fourcc hdv4,hdv5,hdv6
   fourcc hdv7,hdv8,hdv9
+  fourcc hdva,xdhd,xdh2
   fourcc xdv1,xdv2,xdv3
   fourcc xdv4,xdv5,xdv6
   fourcc xdv7,xdv8,xdv9
@@ -937,6 +943,14 @@
   dll flashsv
   out BGR24
 
+videocodec fffsv2
+  info "FFmpeg Flash Screen 2 video"
+  status untested
+  fourcc FSV2
+  driver ffmpeg
+  dll flashsv2
+  out BGR24
+
 videocodec ffdivx
   info "FFmpeg DivX ;-) (MSMPEG-4 v3)"
   status working
@@ -948,8 +962,8 @@
   fourcc DIVF,divf    ; divx4.12
   fourcc AP41 div3        ; AngelPotion stuff
   fourcc COL1,col1,COL0,col0 ; Cool codec (based on mpg4ds32.ax)
-  fourcc 3IVD,3ivd    ; divxdoctored files (3ivx.com)
-  fourcc DVX3
+  fourcc 3IVD,3ivd,3VID,3vid    ; divxdoctored files (3ivx.com)
+  fourcc DVX3,DVX1
   driver ffmpeg
   dll msmpeg4
   out YV12,I420,IYUV
@@ -1085,6 +1099,7 @@
   fourcc ai15,ai16
   fourcc ai5p,ai5q,ai52,ai53
   fourcc ai55,ai56
+  fourcc x3eV
   format 0x10000005
   driver ffmpeg
   dll h264
@@ -1101,6 +1116,7 @@
   fourcc ai15,ai16
   fourcc ai5p,ai5q,ai52,ai53
   fourcc ai55,ai56
+  fourcc x3eV
   format 0x10000005
   driver ffmpeg
   dll h264_vdpau
@@ -1118,6 +1134,7 @@
   fourcc ai15,ai16
   fourcc ai5p,ai5q,ai52,ai53
   fourcc ai55,ai56
+  fourcc x3eV
   format 0x10000005
   driver ffmpeg
   dll h264_crystalhd
@@ -1136,6 +1153,7 @@
   fourcc ai15,ai16
   fourcc ai5p,ai5q,ai52,ai53
   fourcc ai55,ai56
+  fourcc x3eV
   format 0x10000005
   driver dshow
   dll "CoreAVCDecoder.ax"
@@ -1180,7 +1198,7 @@
   fourcc EPHV,SN40,WAWV
   fourcc uldx,ULDX,VSPX
   fourcc SIPP ; Samsung SHR-6040
-  fourcc DreX
+  fourcc DreX,DM4V,LMP4,DP02
   driver ffmpeg
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
@@ -1214,7 +1232,7 @@
   fourcc EPHV,SN40,WAWV
   fourcc uldx,ULDX,VSPX
   fourcc SIPP ; Samsung SHR-6040
-  fourcc DreX
+  fourcc DreX,DM4V,LMP4,DP02
   driver ffmpeg
   dll mpeg4_vdpau
   out VDPAU_MPEG4
@@ -1302,7 +1320,7 @@
   fourcc uldx,ULDX,VSPX
   format 0x10000004  ; mpeg 4 es
   fourcc SIPP ; Samsung SHR-6040
-  fourcc DreX
+  fourcc DreX,DM4V,LMP4,DP02
   driver xvid
   out YV12
   out I420
@@ -1537,7 +1555,7 @@
 videocodec ffmjpeg
   info "FFmpeg MJPEG"
   status working
-  fourcc MJPG,mjpg
+  fourcc MJPG,mjpg,mJPG
   fourcc AVRn,AVDJ  ; AVID
   fourcc ADJV       ; Avid Motion JPEG
   fourcc jpeg       ; MOV Photo-JPEG
@@ -1546,7 +1564,7 @@
   fourcc ijpg,IJPG  ; -mf type=jpeg
   fourcc JPEG       ; SGI's AVI Photo-JPEG
   fourcc JPGL       ; lossless JPEG (pegasus codec)
-  fourcc LJPG       ; lossless JPEG
+  fourcc LJPG,Ljpg       ; lossless JPEG
   fourcc dmb1       ; MJPEG by Matrox Rainbow Runner
   fourcc MJLS       ; JPEG-LS custom FOURCC for avi - encoder
   fourcc MMJP,QIVG
@@ -1556,7 +1574,8 @@
   fourcc IJLV       ; Intel JPEG Library Video Codec
   fourcc CJPG       ; Creative MJPG
   fourcc avi1,avi2
-  fourcc MTSJ,ZJPG
+  fourcc MTSJ,ZJPG,MJPx,FLJP
+  fourcc FMJP,SJPG
   driver ffmpeg
   dll mjpeg
   out 444P
@@ -1671,7 +1690,7 @@
   fourcc MJ2C
   fourcc MJP2
   fourcc mjp2
-  fourcc LJ2K
+  fourcc LJ2K,LJ2C
   driver ffmpeg
   dll "j2k"
   out RGB24,Y800
@@ -1812,7 +1831,7 @@
   fourcc viv1 h263
   fourcc s263,S263
   fourcc T263
-  fourcc D263     ; DEC H263
+  fourcc D263,d263     ; DEC H263
   fourcc L263     ; Lead H263
   fourcc ILVR     ; ITU H263+
   fourcc VX1K     ; Agora Labs VX1000S H263
@@ -1955,7 +1974,7 @@
 videocodec ffdv
   info "FFmpeg DV"
   status working
-  fourcc CDVC,cdvc
+  fourcc CDVC,cdvc,CDV2,CDVP
   fourcc CDVH,cdvh   ; Canopus DVCPRO HD
   fourcc CDV5        ; Canopus SD50
   fourcc DVSD,dvsd   ; PAL
@@ -1963,6 +1982,7 @@
   fourcc "dvcp"      ; PAL DV in .mov
   fourcc "dvc "      ; NTSC DV in .mov
   fourcc "dvp "
+  fourcc "dv  "
   fourcc dvpp        ; DVCPRO - PAL
   fourcc dv50        ; DVCPRO 50
   fourcc dv5n        ; DVCPRO 50 NTSC in .mov
@@ -1970,8 +1990,9 @@
   fourcc AVdv,AVd1
   fourcc dvhq,dvhp
   fourcc dvh5,dvh6,dvh3
-  fourcc dvhd,dvsl,dv25
-  fourcc dvs1,dvh1
+  fourcc dvhd,dvsl,dv25,dc25
+  fourcc dvs1,dvh1,dvis,PDVC
+  fourcc IPDV,ipdv
   driver ffmpeg
   dll dvvideo
   out 411P,422P,YV12
@@ -3582,6 +3603,7 @@
   fourcc uyv1 UYVY
   fourcc 2Vu1 UYVY
   fourcc VDTZ UYVY
+  fourcc auv2 UYVY
   out UYVY
 
 videocodec raw444P
@@ -3720,7 +3742,7 @@
   fourcc 2Vu1,2vu1,2VU1
   fourcc 2Vuy,2vuy,2VUY
   fourcc AV1x,AVup
-  fourcc VDTZ
+  fourcc VDTZ,auv2
   driver ffmpeg
   dll rawvideo
   out UYVY