diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1aa29950bcc5fc84f4b8c644fe2ea73f2fbd2712..a36835d35ba21f7a2839b0ffbb10ef8b32dc14b4 100644
--- 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 7bfa2d497059ebac0acf51e46c1e294869497075..e5c2460f74f4766f383adfee346a357c82c5741c 100644
--- 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 */