# HG changeset patch
# User compn
# Date 1221851792 0
# Node ID 891956ec4df12d5a89bb03f4139a726ec4b6cfa8
# Parent  21604ffa872cbfa4f7ef33034ed7d10d796a4a4e
sync with libavformat/riff.c

diff -r 21604ffa872c -r 891956ec4df1 etc/codecs.conf
--- a/etc/codecs.conf	Fri Sep 19 18:50:42 2008 +0000
+++ b/etc/codecs.conf	Fri Sep 19 19:16:32 2008 +0000
@@ -772,6 +772,7 @@
   fourcc SMP4,smp4 ; Samsung SMP4 video codec
   fourcc VIDM ; vidm 4.01 codec
   format 0x10000004  ; mpeg 4 es
+  fourcc 4000,BLZ0
   driver ffmpeg
   dll mpeg4 ;opendivx
   out YV12,I420,IYUV
@@ -1020,6 +1021,7 @@
   fourcc JPGL       ; lossless JPEG (pegasus codec)
   fourcc LJPG       ; lossless JPEG
   fourcc dmb1       ; MJPEG by Matrox Rainbow Runner
+  fourcc MJLS       ; JPEG-LS custom FOURCC for avi - encoder
   driver ffmpeg
   dll mjpeg
   out 444P
@@ -1369,6 +1371,7 @@
   fourcc AVdv,AVd1
   fourcc dvhq,dvhp
   fourcc dvh5,dvh6,dvh3
+  fourcc dvhd,dvsl,dv25
   driver ffmpeg
   dll dvvideo
   out 411P,422P,YV12