Commit c63ea92b authored by Peter Ross's avatar Peter Ross

Electronic Arts Madcow decoder

Originally committed as revision 19178 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 86b61d42
...@@ -24,6 +24,7 @@ version <next>: ...@@ -24,6 +24,7 @@ version <next>:
- SoX native format muxer and demuxer - SoX native format muxer and demuxer
- AMR-NB decoding/encoding, AMR-WB decoding via OpenCORE libraries - AMR-NB decoding/encoding, AMR-WB decoding via OpenCORE libraries
- DPX image decoder - DPX image decoder
- Electronic Arts Madcow decoder
......
...@@ -356,6 +356,7 @@ following image formats are supported: ...@@ -356,6 +356,7 @@ following image formats are supported:
@tab Codec originally used in Feeble Files game. @tab Codec originally used in Feeble Files game.
@item Electronic Arts CMV video @tab @tab X @item Electronic Arts CMV video @tab @tab X
@tab Used in NHL 95 game. @tab Used in NHL 95 game.
@item Electronic Arts Madcow video @tab @tab X
@item Electronic Arts TGV video @tab @tab X @item Electronic Arts TGV video @tab @tab X
@item Electronic Arts TGQ video @tab @tab X @item Electronic Arts TGQ video @tab @tab X
@item Electronic Arts TQI video @tab @tab X @item Electronic Arts TQI video @tab @tab X
......
...@@ -76,6 +76,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o ...@@ -76,6 +76,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER) += dv.o
OBJS-$(CONFIG_DXA_DECODER) += dxa.o OBJS-$(CONFIG_DXA_DECODER) += dxa.o
OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o
OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o
OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o
OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o
OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o
......
...@@ -81,6 +81,7 @@ void avcodec_register_all(void) ...@@ -81,6 +81,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (DVVIDEO, dvvideo); REGISTER_ENCDEC (DVVIDEO, dvvideo);
REGISTER_DECODER (DXA, dxa); REGISTER_DECODER (DXA, dxa);
REGISTER_DECODER (EACMV, eacmv); REGISTER_DECODER (EACMV, eacmv);
REGISTER_DECODER (EAMAD, eamad);
REGISTER_DECODER (EATGQ, eatgq); REGISTER_DECODER (EATGQ, eatgq);
REGISTER_DECODER (EATGV, eatgv); REGISTER_DECODER (EATGV, eatgv);
REGISTER_DECODER (EATQI, eatqi); REGISTER_DECODER (EATQI, eatqi);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 30 #define LIBAVCODEC_VERSION_MINOR 31
#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_MICRO 2
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...@@ -197,6 +197,7 @@ enum CodecID { ...@@ -197,6 +197,7 @@ enum CodecID {
CODEC_ID_TMV, CODEC_ID_TMV,
CODEC_ID_V210, CODEC_ID_V210,
CODEC_ID_DPX, CODEC_ID_DPX,
CODEC_ID_MAD,
/* 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