# HG changeset patch
# User kostya
# Date 1165465021 0
# Node ID c2bcb3056ed7e472e78e9faa90c19952b751e69f
# Parent  07625477adfac00da6d34554f0492e1f463348fa
ZMBV encoder

diff -r 07625477adfa -r c2bcb3056ed7 Makefile
--- a/Makefile	Wed Dec 06 23:46:11 2006 +0000
+++ b/Makefile	Thu Dec 07 04:17:01 2006 +0000
@@ -167,6 +167,7 @@
 OBJS-$(CONFIG_ZLIB_DECODER)            += lcl.o
 OBJS-$(CONFIG_ZLIB_ENCODER)            += lcl.o
 OBJS-$(CONFIG_ZMBV_DECODER)            += zmbv.o
+OBJS-$(CONFIG_ZMBV_ENCODER)            += zmbvenc.o
 
 OBJS-$(CONFIG_PCM_S32LE_DECODER)       += pcm.o
 OBJS-$(CONFIG_PCM_S32LE_ENCODER)       += pcm.o
diff -r 07625477adfa -r c2bcb3056ed7 allcodecs.c
--- a/allcodecs.c	Wed Dec 06 23:46:11 2006 +0000
+++ b/allcodecs.c	Thu Dec 07 04:17:01 2006 +0000
@@ -155,7 +155,9 @@
     REGISTER_ENCODER(XVID, xvid);
 #endif
     REGISTER_ENCDEC (ZLIB, zlib);
-    REGISTER_DECODER(ZMBV, zmbv);
+#ifdef CONFIG_ZLIB
+    REGISTER_ENCDEC (ZMBV, zmbv);
+#endif
 
     /* audio codecs */
 #ifdef CONFIG_FAAD
diff -r 07625477adfa -r c2bcb3056ed7 avcodec.h
--- a/avcodec.h	Wed Dec 06 23:46:11 2006 +0000
+++ b/avcodec.h	Thu Dec 07 04:17:01 2006 +0000
@@ -37,8 +37,8 @@
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(25<<8)+0)
-#define LIBAVCODEC_VERSION      51.25.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(26<<8)+0)
+#define LIBAVCODEC_VERSION      51.26.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -2303,6 +2303,7 @@
 extern AVCodec bmp_decoder;
 extern AVCodec mmvideo_decoder;
 extern AVCodec zmbv_decoder;
+extern AVCodec zmbv_encoder;
 extern AVCodec avs_decoder;
 extern AVCodec smacker_decoder;
 extern AVCodec smackaud_decoder;