Smacker demuxer and decoder.

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

Changelog

@@ -41,6 +41,7 @@ version <next>
 - Improved Theora/VP3 decoder
 - True Audio (TTA) decoder
 - AVS demuxer and video decoder
+- Smacker demuxer and decoder
 
 version 0.4.9-pre1:
 

doc/ffmpeg-doc.texi

@@ -702,6 +702,8 @@ library:
 @tab Multimedia format used in games like Mad Dog McCree
 @item AVS @tab    @tab X
 @tab Multimedia format used by the Creature Shock game.
+@item Smacker @tab    @tab X
+@tab Multimedia format used by many games.
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
@@ -796,6 +798,7 @@ following image formats are supported:
 @item American Laser Games Video  @tab    @tab X @tab Used in games like Mad Dog McCree
 @item ZMBV                   @tab     @tab  X @tab
 @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.
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.
@@ -871,6 +874,7 @@ other implementations.
 @tab All versions except 5.1 are supported
 @item DSP Group TrueSpeech   @tab      @tab X
 @item True Audio (TTA)       @tab      @tab X
+@item Smacker Audio          @tab      @tab X
 @end multitable
 
 @code{X} means that encoding (resp. decoding) is supported.

libavcodec/Makefile

@@ -146,6 +146,9 @@ endif
 ifeq ($(CONFIG_SHORTEN_DECODER),yes)
     OBJS+= shorten.o
 endif
+ifneq ($(CONFIG_SMACKER_DECODER)$(CONFIG_SMACKAUD_DECODER),)
+    OBJS+= smacker.o
+endif
 ifeq ($(CONFIG_SMC_DECODER),yes)
     OBJS+= smc.o
 endif

libavcodec/allcodecs.c

@@ -447,6 +447,12 @@ void avcodec_register_all(void)
 #ifdef CONFIG_ZMBV_DECODER
     register_avcodec(&zmbv_decoder);
 #endif //CONFIG_ZMBV_DECODER
+#ifdef CONFIG_SMACKER_DECODER
+    register_avcodec(&smacker_decoder);
+#endif //CONFIG_SMACKER_DECODER
+#ifdef CONFIG_SMACKAUD_DECODER
+    register_avcodec(&smackaud_decoder);
+#endif //CONFIG_SMACKAUD_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)+(7<<8)+0)
-#define LIBAVCODEC_VERSION      51.7.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(8<<8)+0)
+#define LIBAVCODEC_VERSION      51.8.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -118,6 +118,7 @@ enum CodecID {
     CODEC_ID_MMVIDEO,
     CODEC_ID_ZMBV,
     CODEC_ID_AVS,
+    CODEC_ID_SMACKVIDEO,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,
@@ -198,6 +199,7 @@ enum CodecID {
     CODEC_ID_COOK,
     CODEC_ID_TRUESPEECH,
     CODEC_ID_TTA,
+    CODEC_ID_SMACKAUDIO,
 
     CODEC_ID_OGGTHEORA= 0x16000,
 
@@ -2238,6 +2240,8 @@ extern AVCodec bmp_decoder;
 extern AVCodec mmvideo_decoder;
 extern AVCodec zmbv_decoder;
 extern AVCodec avs_decoder;
+extern AVCodec smacker_decoder;
+extern AVCodec smackaud_decoder;
 
 /* pcm codecs */
 #define PCM_CODEC(id, name) \

libavformat/Makefile

@@ -18,7 +18,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
       sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
       ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o aiff.o \
-      voc.o tta.o mm.o avs.o
+      voc.o tta.o mm.o avs.o smacker.o
 
 # muxers
 ifeq ($(CONFIG_MUXERS),yes)

libavformat/allformats.c

@@ -80,6 +80,7 @@ void av_register_all(void)
     flic_init();
     vmd_init();
     mm_init();
+    smacker_init();
 
 #if defined(AMR_NB) || defined(AMR_NB_FIXED) || defined(AMR_WB)
     amr_init();

libavformat/avformat.h

@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-#define LIBAVFORMAT_VERSION_INT ((50<<16)+(3<<8)+0)
-#define LIBAVFORMAT_VERSION     50.3.0
+#define LIBAVFORMAT_VERSION_INT ((50<<16)+(4<<8)+0)
+#define LIBAVFORMAT_VERSION     50.4.0
 #define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
 
 #define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
@@ -567,6 +567,9 @@ int mm_init(void);
 /* avs.c */
 int avs_init(void);
 
+/* smacker.c */
+int smacker_init(void);
+
 #include "rtp.h"
 
 #include "rtsp.h"