diff options
| author | Mike Melanson <mike@multimedia.cx> | 2006-02-12 08:53:29 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2006-02-12 08:53:29 +0000 |
| commit | 9c8d8e84e0f4534d58be6b66f6ec1eef51e1d89c (patch) | |
| tree | 04088d086300e11fcbbfcc94a0b0db6986a76e39 /libavcodec/avcodec.h | |
| parent | 4e114829b1d03ce4714c45f5d8628d46cc873cc0 (diff) | |
| download | ffmpeg-9c8d8e84e0f4534d58be6b66f6ec1eef51e1d89c.tar.gz | |
dosbox native ZMBV decoder, courtesy of Kostya
Originally committed as revision 5000 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d29d258d45..d0d5e64188 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -21,8 +21,8 @@ extern "C" { #define AV_STRINGIFY(s) AV_TOSTRING(s) #define AV_TOSTRING(s) #s -#define LIBAVCODEC_VERSION_INT ((51<<16)+(2<<8)+0) -#define LIBAVCODEC_VERSION 51.2.0 +#define LIBAVCODEC_VERSION_INT ((51<<16)+(4<<8)+0) +#define LIBAVCODEC_VERSION 51.4.0 #define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT #define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION) @@ -116,6 +116,7 @@ enum CodecID { CODEC_ID_BMP, CODEC_ID_CSCD, CODEC_ID_MMVIDEO, + CODEC_ID_ZMBV, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE= 0x10000, @@ -2228,6 +2229,7 @@ extern AVCodec libgsm_encoder; extern AVCodec libgsm_decoder; extern AVCodec bmp_decoder; extern AVCodec mmvideo_decoder; +extern AVCodec zmbv_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \ |