# HG changeset patch
# User compn
# Date 1262722326 0
# Node ID a5084db38f0eacaf820398634d9361fabbf46f1d
# Parent  843770c45346e2996f31b1461d8ea9e34b450392
map zjpeg to ffmjpeg in codecs.conf

diff -r 843770c45346 -r a5084db38f0e etc/codecs.conf
--- a/etc/codecs.conf	Tue Jan 05 20:04:44 2010 +0000
+++ b/etc/codecs.conf	Tue Jan 05 20:12:06 2010 +0000
@@ -1300,7 +1300,7 @@
   fourcc MVJP       ; Midvid JPEG Video Codec
   fourcc IJLV       ; Intel JPEG Library Video Codec
   fourcc avi1,avi2
-  fourcc MTSJ
+  fourcc MTSJ,ZJPG
   driver ffmpeg
   dll mjpeg
   out 444P