aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2006-12-08 05:13:40 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2006-12-08 05:13:40 +0000
commit3dd52c5afed5f9f5c4e2ee6ae605df84a9f5e128 (patch)
tree6e743014966eb3ac20bee8580a596462ae6f12c4
parent766937298e75ac47fb26fdf36a93630c679cfdd4 (diff)
downloadffmpeg-3dd52c5afed5f9f5c4e2ee6ae605df84a9f5e128.tar.gz
Now ZMBV encoder compiles
Originally committed as revision 7259 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile2
-rw-r--r--libavcodec/allcodecs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a36835d35b..1aa29950bc 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 e5c2460f74..7bfa2d4970 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 */