dosbox native ZMBV decoder, courtesy of Kostya

Originally committed as revision 5000 to svn://svn.ffmpeg.org/ffmpeg/trunk

Changelog

@@ -37,6 +37,7 @@ version <next>
 - ADTS AAC file reading and writing
 - Creative VOC file reading and writing
 - American Laser Games multimedia (*.mm) playback system
+- Zip Blocks Motion Video decoder
 
 version 0.4.9-pre1:
 

doc/ffmpeg-doc.texi

@@ -791,6 +791,7 @@ following image formats are supported:
 @item Fraps FPS1             @tab     @tab  X @tab
 @item CamStudio              @tab     @tab  X @tab fourcc: CSCD
 @item American Laser Games Video  @tab    @tab X @tab Used in games like Mad Dog McCree
+@item ZMBV                   @tab     @tab  X @tab
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.

libavcodec/Makefile

@@ -221,6 +221,9 @@ endif
 ifeq ($(CONFIG_MMVIDEO_DECODER),yes)
 	OBJS+= mmvideo.o
 endif
+ifeq ($(CONFIG_ZMBV_DECODER),yes)
+	OBJS+= zmbv.o
+endif
 
 AMROBJS=
 ifeq ($(AMR_NB),yes)

libavcodec/allcodecs.c

@@ -444,6 +444,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_ZLIB_DECODER
     register_avcodec(&zlib_decoder);
 #endif //CONFIG_ZLIB_DECODER
+#ifdef CONFIG_ZMBV_DECODER
+    register_avcodec(&zmbv_decoder);
+#endif //CONFIG_ZMBV_DECODER
 #ifdef CONFIG_SONIC_DECODER
     register_avcodec(&sonic_decoder);
 #endif //CONFIG_SONIC_DECODER

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) \

libavformat/avienc.c

@@ -195,6 +195,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') },
     { CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') },
     { CODEC_ID_CSCD, MKTAG('C', 'S', 'C', 'D') },
+    { CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') },
     { CODEC_ID_RAWVIDEO, 0 },
     { 0, 0 },
 };