Commit a7129de5 authored by Ramiro Polla's avatar Ramiro Polla

Mimic decoder.

Originally committed as revision 12491 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2119bb8f
...@@ -113,6 +113,7 @@ version <next> ...@@ -113,6 +113,7 @@ version <next>
- QT variant of IMA ADPCM encoder - QT variant of IMA ADPCM encoder
- VFW grabber - VFW grabber
- Ipod/Iphone compatible mp4 muxer - Ipod/Iphone compatible mp4 muxer
- Mimic decoder
version 0.4.9-pre1: version 0.4.9-pre1:
......
...@@ -145,6 +145,7 @@ Codecs: ...@@ -145,6 +145,7 @@ Codecs:
loco.c Kostya Shishkov loco.c Kostya Shishkov
lzo.h, lzo.c Reimar Doeffinger lzo.h, lzo.c Reimar Doeffinger
mdec.c Michael Niedermayer mdec.c Michael Niedermayer
mimic.c Ramiro Polla
mjpeg.c Michael Niedermayer mjpeg.c Michael Niedermayer
mpc* Kostya Shishkov mpc* Kostya Shishkov
mpeg12.c, mpeg12data.h Michael Niedermayer mpeg12.c, mpeg12data.h Michael Niedermayer
......
...@@ -103,6 +103,7 @@ OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o mpegvide ...@@ -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_LOCO_DECODER) += loco.o golomb.o
OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o
OBJS-$(CONFIG_MACE6_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_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_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 OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o
......
...@@ -101,6 +101,7 @@ void avcodec_register_all(void) ...@@ -101,6 +101,7 @@ void avcodec_register_all(void)
REGISTER_ENCODER (LJPEG, ljpeg); REGISTER_ENCODER (LJPEG, ljpeg);
REGISTER_DECODER (LOCO, loco); REGISTER_DECODER (LOCO, loco);
REGISTER_DECODER (MDEC, mdec); REGISTER_DECODER (MDEC, mdec);
REGISTER_DECODER (MIMIC, mimic);
REGISTER_ENCDEC (MJPEG, mjpeg); REGISTER_ENCDEC (MJPEG, mjpeg);
REGISTER_DECODER (MJPEGB, mjpegb); REGISTER_DECODER (MJPEGB, mjpegb);
REGISTER_DECODER (MMVIDEO, mmvideo); REGISTER_DECODER (MMVIDEO, mmvideo);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 51 #define LIBAVCODEC_VERSION_MAJOR 51
#define LIBAVCODEC_VERSION_MINOR 51 #define LIBAVCODEC_VERSION_MINOR 52
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...@@ -177,6 +177,7 @@ enum CodecID { ...@@ -177,6 +177,7 @@ enum CodecID {
CODEC_ID_SUNRAST, CODEC_ID_SUNRAST,
CODEC_ID_INDEO4, CODEC_ID_INDEO4,
CODEC_ID_INDEO5, CODEC_ID_INDEO5,
CODEC_ID_MIMIC,
/* various PCM "codecs" */ /* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000, CODEC_ID_PCM_S16LE= 0x10000,
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment