[MPlayer-cvslog] r27642 - trunk/etc/codecs.conf

[compn]

Author: compn
Date: Fri Sep 19 21:16:32 2008
New Revision: 27642

Log:
sync with libavformat/riff.c

Modified:
   trunk/etc/codecs.conf

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Fri Sep 19 21:16:32 2008
@@ -772,6 +772,7 @@ videocodec ffodivx
   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 @@ videocodec ffmjpeg
   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 @@ videocodec ffdv
   fourcc AVdv,AVd1
   fourcc dvhq,dvhp
   fourcc dvh5,dvh6,dvh3
+  fourcc dvhd,dvsl,dv25
   driver ffmpeg
   dll dvvideo
   out 411P,422P,YV12