diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-12-07 18:29:02 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-12-07 18:29:02 +0000 |
| commit | f95778f80d27538b68c72858914bcccfbcda02cf (patch) | |
| tree | 82765b3e8bb8cb14001b061c52e4092246617e50 | |
| parent | f1862127f505594894fd120c1eb4e9dd3c096b62 (diff) | |
| download | ffmpeg-f95778f80d27538b68c72858914bcccfbcda02cf.tar.gz | |
fix compilation
Originally committed as revision 7248 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1aa29950bc..a36835d35b 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 7bfa2d4970..e5c2460f74 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 */ |