# HG changeset patch
# User compn
# Date 1221850242 0
# Node ID 21604ffa872cbfa4f7ef33034ed7d10d796a4a4e
# Parent  2351f5586fe7cb7d08bb2193bcdd9d747f2f6dab
sync with libavformat/isom.c fourcc

diff -r 2351f5586fe7 -r 21604ffa872c etc/codecs.conf
--- a/etc/codecs.conf	Fri Sep 19 18:20:31 2008 +0000
+++ b/etc/codecs.conf	Fri Sep 19 18:50:42 2008 +0000
@@ -85,7 +85,12 @@
   fourcc xdv7,xdv8,xdv9
   fourcc xdva,xdvb,xdvc
   fourcc xdvd,xdve,xdvf
-  fourcc xd5b
+  fourcc xd5a,xd5b,xd5c
+  fourcc xd5d.xd5e,xd5f
+  fourcc xd59
+  fourcc mx5n,mx5p,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
   driver mpegpes
   out MPES
 
@@ -120,7 +125,12 @@
   fourcc xdv7,xdv8,xdv9
   fourcc xdva,xdvb,xdvc
   fourcc xdvd,xdve,xdvf
-  fourcc xd5b
+  fourcc xd5a,xd5b,xd5c
+  fourcc xd5d.xd5e,xd5f
+  fourcc xd59
+  fourcc mx5n,mx5p,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
   driver ffmpeg
   dll "mpeg2video"
   out YV12,I420,IYUV
@@ -149,7 +159,12 @@
   fourcc xdv7,xdv8,xdv9
   fourcc xdva,xdvb,xdvc
   fourcc xdvd,xdve,xdvf
-  fourcc xd5b
+  fourcc xd5a,xd5b,xd5c
+  fourcc xd5d.xd5e,xd5f
+  fourcc xd59
+  fourcc mx5n,mx5p,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
   driver ffmpeg
   dll "mpegvideo"
   out YV12,I420,IYUV
@@ -179,7 +194,12 @@
   fourcc xdv7,xdv8,xdv9
   fourcc xdva,xdvb,xdvc
   fourcc xdvd,xdve,xdvf
-  fourcc xd5b
+  fourcc xd5a,xd5b,xd5c
+  fourcc xd5d.xd5e,xd5f
+  fourcc xd59
+  fourcc mx5n,mx5p,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
   driver libmpeg2
 ;  dll "libmpeg2"
   out YV12,I420,IYUV
@@ -207,7 +227,12 @@
   fourcc xdv7,xdv8,xdv9
   fourcc xdva,xdvb,xdvc
   fourcc xdvd,xdve,xdvf
-  fourcc xd5b
+  fourcc xd5a,xd5b,xd5c
+  fourcc xd5d.xd5e,xd5f
+  fourcc xd59
+  fourcc mx5n,mx5p,mx4n,mx4p
+  fourcc mx3n,mx3p
+  fourcc AVmp
   driver ffmpeg
   dll "mpegvideo_xvmc"
   out IDCT_MPEG2
@@ -1086,6 +1111,7 @@
   info "Morgan MJPEG2000"
   status working
   fourcc MJ2C
+  fourcc MJP2
   driver vfw
   dll "m3jp2k32.dll"
   out YV12,I420,IYUV
@@ -1340,6 +1366,9 @@
   fourcc dv50        ; DVCPRO 50
   fourcc dv5n        ; DVCPRO 50 NTSC in .mov
   fourcc dv5p        ; DVCPRO 50 PAL in .mov
+  fourcc AVdv,AVd1
+  fourcc dvhq,dvhp
+  fourcc dvh5,dvh6,dvh3
   driver ffmpeg
   dll dvvideo
   out 411P,422P,YV12
@@ -1355,7 +1384,9 @@
   fourcc dv50        ; DVCPRO 50
   fourcc dv5n        ; DVCPRO 50 NTSC in .mov
   fourcc dv5p        ; DVCPRO 50 PAL in .mov
-  fourcc AVdv        ; AVID DV
+  fourcc AVdv,AVd1   ; AVID DV
+  fourcc dvhq,dvhp
+  fourcc dvh5,dvh6,dvh3
   driver libdv
   dll libdv.so.2
   out YUY2
@@ -1889,6 +1920,7 @@
   comment "only works with libavformat demuxer"
   status working
   fourcc CAVS
+  fourcc avs2
   driver ffmpeg
   dll "cavs"
   out I420
@@ -2971,6 +3003,7 @@
   info "FFmpeg DV audio decoder"
   status working
   fourcc RADV
+  fourcc vdva,dvca
   driver ffmpeg
   dll "dvaudio"