diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2006-12-07 04:17:01 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2006-12-07 04:17:01 +0000 |
| commit | f48d6e1b44e591b337c10080480ae642488b1d1d (patch) | |
| tree | e722422ec787acc8a7f157d5052d74b2180d36d9 /libavcodec | |
| parent | f27a726809bf8e5e1fa24638bbd6e04afa1fcd36 (diff) | |
| download | ffmpeg-f48d6e1b44e591b337c10080480ae642488b1d1d.tar.gz | |
ZMBV encoder
Originally committed as revision 7242 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 03c1ae43dc..1aa29950bc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -167,6 +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_PCM_S32LE_DECODER) += pcm.o OBJS-$(CONFIG_PCM_S32LE_ENCODER) += pcm.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 9678f6bee4..7bfa2d4970 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -155,7 +155,9 @@ void avcodec_register_all(void) REGISTER_ENCODER(XVID, xvid); #endif REGISTER_ENCDEC (ZLIB, zlib); - REGISTER_DECODER(ZMBV, zmbv); +#ifdef CONFIG_ZLIB + REGISTER_ENCDEC (ZMBV, zmbv); +#endif /* audio codecs */ #ifdef CONFIG_FAAD diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4fefcb11a2..cbf29c8a58 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -37,8 +37,8 @@ extern "C" { #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(25<<8)+0) -#define LIBAVCODEC_VERSION 51.25.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(26<<8)+0) +#define LIBAVCODEC_VERSION 51.26.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -2303,6 +2303,7 @@ extern AVCodec libgsm_decoder; extern AVCodec bmp_decoder; extern AVCodec mmvideo_decoder; extern AVCodec zmbv_decoder; +extern AVCodec zmbv_encoder; extern AVCodec avs_decoder; extern AVCodec smacker_decoder; extern AVCodec smackaud_decoder; |