KMVC (used in Worms games) decoder. Works fine with samples from MPHQ

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

Changelog

@@ -44,6 +44,7 @@ version <next>
 - AVS demuxer and video decoder
 - Smacker demuxer and decoder
 - NuppelVideo/MythTV demuxer and RTjpeg decoder
+- KMVC decoder
 
 version 0.4.9-pre1:
 

MAINTAINERS

@@ -124,6 +124,7 @@ Codecs:
   indeo2*                               Kostya Shishkov
   interplayvideo.c                      Mike Melanson
   jpeg_ls.c                             Kostya Shishkov
+  kmvc.c                                Kostya Shishkov
   lcl.c                                 Roberto Togni
   loco.c                                Kostya Shishkov
   lzo.h, lzo.c                          Reimar Doeffinger

doc/ffmpeg-doc.texi

@@ -800,6 +800,7 @@ following image formats are supported:
 @item AVS Video              @tab     @tab  X @tab Video encoding used by the Creature Shock game.
 @item Smacker Video          @tab     @tab  X @tab Video encoding used in Smacker.
 @item RTjpeg                 @tab     @tab  X @tab Video encoding used in NuppelVideo files.
+@item KMVC                   @tab     @tab  X @tab Codec used in Worms games.
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.

libavcodec/Makefile

@@ -98,6 +98,9 @@ endif
 ifeq ($(CONFIG_INTERPLAY_VIDEO_DECODER),yes)
     OBJS+= interplayvideo.o
 endif
+ifeq ($(CONFIG_KMVC_DECODER),yes)
+    OBJS+= kmvc.o
+endif
 ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),)
     OBJS+= lcl.o
 endif

libavcodec/allcodecs.c

@@ -289,6 +289,9 @@ void avcodec_register_all(void)
 #ifdef CONFIG_LOCO_DECODER
     register_avcodec(&loco_decoder);
 #endif //CONFIG_LOCO_DECODER
+#ifdef CONFIG_KMVC_DECODER
+    register_avcodec(&kmvc_decoder);
+#endif //CONFIG_KMVC_DECODER
 #ifdef CONFIG_WNV1_DECODER
     register_avcodec(&wnv1_decoder);
 #endif //CONFIG_WNV1_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)+(8<<8)+0)
-#define LIBAVCODEC_VERSION      51.8.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(9<<8)+0)
+#define LIBAVCODEC_VERSION      51.9.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -120,6 +120,7 @@ enum CodecID {
     CODEC_ID_AVS,
     CODEC_ID_SMACKVIDEO,
     CODEC_ID_NUV,
+    CODEC_ID_KMVC,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,

libavformat/avienc.c

@@ -200,6 +200,7 @@ const CodecTag codec_bmp_tags[] = {
     { 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_KMVC, MKTAG('K', 'M', 'V', 'C') },
     { CODEC_ID_RAWVIDEO, 0 },
     { CODEC_ID_NONE, 0 },
 };