Commit f95778f8 authored by Michael Niedermayer's avatar Michael Niedermayer

fix compilation

Originally committed as revision 7248 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f1862127
...@@ -167,7 +167,7 @@ OBJS-$(CONFIG_XL_DECODER) += xl.o ...@@ -167,7 +167,7 @@ OBJS-$(CONFIG_XL_DECODER) += xl.o
OBJS-$(CONFIG_ZLIB_DECODER) += lcl.o OBJS-$(CONFIG_ZLIB_DECODER) += lcl.o
OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.o OBJS-$(CONFIG_ZLIB_ENCODER) += lcl.o
OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.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_DECODER) += pcm.o
OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o
......
...@@ -156,7 +156,7 @@ void avcodec_register_all(void) ...@@ -156,7 +156,7 @@ void avcodec_register_all(void)
#endif #endif
REGISTER_ENCDEC (ZLIB, zlib); REGISTER_ENCDEC (ZLIB, zlib);
#ifdef CONFIG_ZLIB #ifdef CONFIG_ZLIB
REGISTER_ENCDEC (ZMBV, zmbv); // REGISTER_ENCDEC (ZMBV, zmbv);
#endif #endif
/* audio codecs */ /* audio codecs */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment