Now ZMBV encoder compiles

Originally committed as revision 7259 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a36835d..1aa2995 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -167,7 +167,7 @@ OBJS-$(CONFIG_XL_DECODER)              += xl.o
 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_ZMBV_ENCODER)            += zmbvenc.o
 
 OBJS-$(CONFIG_PCM_S32LE_DECODER)       += pcm.o
 OBJS-$(CONFIG_PCM_S32LE_ENCODER)       += pcm.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index e5c2460..7bfa2d4 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -156,7 +156,7 @@ void avcodec_register_all(void)
 #endif
     REGISTER_ENCDEC (ZLIB, zlib);
 #ifdef CONFIG_ZLIB
-//    REGISTER_ENCDEC (ZMBV, zmbv);
+    REGISTER_ENCDEC (ZMBV, zmbv);
 #endif
 
     /* audio codecs */