# HG changeset patch
# User rtognimp
# Date 1073947683 0
# Node ID 6d19216b4f2cbe8a7e88e484217736e0ce5d3e41
# Parent  c2e36b3193a1389d24bf9db9e755361b2db2b277
Use MSZH and ZLIB decoders from libavcodec

diff -r c2e36b3193a1 -r 6d19216b4f2c configure
--- a/configure	Mon Jan 12 13:43:30 2004 +0000
+++ b/configure	Mon Jan 12 22:48:03 2004 +0000
@@ -6131,6 +6131,9 @@
 
 /* Define this if you have zlib */
 $_def_zlib
+#ifdef HAVE_ZLIB
+#define CONFIG_ZLIB
+#endif
 
 /* Define this if you have shm support */
 $_def_shm
diff -r c2e36b3193a1 -r 6d19216b4f2c etc/codecs.conf
--- a/etc/codecs.conf	Mon Jan 12 13:43:30 2004 +0000
+++ b/etc/codecs.conf	Mon Jan 12 22:48:03 2004 +0000
@@ -258,6 +258,22 @@
   out YUY2
   out BGR32,BGR24
 
+videocodec ffmszh
+  info "AVImszh (native codec)"
+  status working
+  fourcc MSZH
+  driver ffmpeg
+  dll "mszh"
+  out BGR24
+
+videocodec ffzlib
+  info "AVIzlib (native codec)"
+  status working
+  fourcc ZLIB
+  driver ffmpeg
+  dll "zlib"
+  out BGR24
+
 videocodec mpmszh
   info "AVImszh (native codec)"
   status working
diff -r c2e36b3193a1 -r 6d19216b4f2c libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Mon Jan 12 13:43:30 2004 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Mon Jan 12 22:48:03 2004 +0000
@@ -285,7 +285,9 @@
 	 sh->format == mmioFOURCC('W','M','V','2') ||
 	 sh->format == mmioFOURCC('A','S','V','1') ||
 	 sh->format == mmioFOURCC('A','S','V','2') ||
-	 sh->format == mmioFOURCC('V','S','S','H')
+	 sh->format == mmioFOURCC('V','S','S','H') ||
+	 sh->format == mmioFOURCC('M','S','Z','H') ||
+	 sh->format == mmioFOURCC('Z','L','I','B')
          ))
     {
 	avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);