Mimic decoder.

Originally committed as revision 12491 to svn://svn.ffmpeg.org/ffmpeg/trunk
lu-zero · Mar 18, 2008 · a7129de · a7129de
1 parent 2119bb8
commit a7129de
Show file tree

Hide file tree

Showing 6 changed files with 404 additions and 1 deletion.
diff --git a/Changelog b/Changelog
@@ -113,6 +113,7 @@ version <next>
 - QT variant of IMA ADPCM encoder
 - VFW grabber
 - Ipod/Iphone compatible mp4 muxer
+- Mimic decoder
 
 version 0.4.9-pre1:
 

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -145,6 +145,7 @@ Codecs:
   loco.c                                Kostya Shishkov
   lzo.h, lzo.c                          Reimar Doeffinger
   mdec.c                                Michael Niedermayer
+  mimic.c                               Ramiro Polla
   mjpeg.c                               Michael Niedermayer
   mpc*                                  Kostya Shishkov
   mpeg12.c, mpeg12data.h                Michael Niedermayer

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
@@ -103,6 +103,7 @@ OBJS-$(CONFIG_LJPEG_ENCODER)           += ljpegenc.o mjpegenc.o mjpeg.o mpegvide
 OBJS-$(CONFIG_LOCO_DECODER)            += loco.o golomb.o
 OBJS-$(CONFIG_MACE3_DECODER)           += mace.o
 OBJS-$(CONFIG_MACE6_DECODER)           += mace.o
+OBJS-$(CONFIG_MIMIC_DECODER)           += mimic.o
 OBJS-$(CONFIG_MJPEG_DECODER)           += mjpegdec.o mjpeg.o
 OBJS-$(CONFIG_MJPEG_ENCODER)           += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
 OBJS-$(CONFIG_MJPEGB_DECODER)          += mjpegbdec.o mjpegdec.o mjpeg.o

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -101,6 +101,7 @@ void avcodec_register_all(void)
     REGISTER_ENCODER (LJPEG, ljpeg);
     REGISTER_DECODER (LOCO, loco);
     REGISTER_DECODER (MDEC, mdec);
+    REGISTER_DECODER (MIMIC, mimic);
     REGISTER_ENCDEC  (MJPEG, mjpeg);
     REGISTER_DECODER (MJPEGB, mjpegb);
     REGISTER_DECODER (MMVIDEO, mmvideo);

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVCODEC_VERSION_MAJOR 51
-#define LIBAVCODEC_VERSION_MINOR 51
+#define LIBAVCODEC_VERSION_MINOR 52
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -177,6 +177,7 @@ enum CodecID {
     CODEC_ID_SUNRAST,
     CODEC_ID_INDEO4,
     CODEC_ID_INDEO5,
+    CODEC_ID_MIMIC,
 
     /* various PCM "codecs" */
     CODEC_ID_PCM_S16LE= 0x10000,