Commit 64af6168 authored by Mike Melanson's avatar Mike Melanson

Duck TrueMotion 2 video decoder, courtesy of Konstantin Shishkov

Originally committed as revision 4638 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f37f8d4c
......@@ -18,7 +18,7 @@ OBJS= bitstream.o utils.o mem.o allcodecs.o \
fft.o mdct.o raw.o golomb.o cabac.o\
dpcm.o adx.o faandct.o parser.o g726.o \
vp3dsp.o h264idct.o rangecoder.o pnm.o h263.o msmpeg4.o h263dec.o dvdsub.o dvbsub.o dvbsubdec.o\
opt.o
opt.o truemotion2.o
ifeq ($(CONFIG_AASC_DECODER),yes)
OBJS+= aasc.o
......
......@@ -424,6 +424,9 @@ void avcodec_register_all(void)
#ifdef CONFIG_TRUEMOTION1_DECODER
register_avcodec(&truemotion1_decoder);
#endif //CONFIG_TRUEMOTION1_DECODER
#ifdef CONFIG_TRUEMOTION2_DECODER
register_avcodec(&truemotion2_decoder);
#endif //CONFIG_TRUEMOTION2_DECODER
#ifdef CONFIG_VMDVIDEO_DECODER
register_avcodec(&vmdvideo_decoder);
#endif //CONFIG_VMDVIDEO_DECODER
......
......@@ -111,6 +111,7 @@ enum CodecID {
CODEC_ID_AASC,
CODEC_ID_INDEO2,
CODEC_ID_FRAPS,
CODEC_ID_TRUEMOTION2,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
......@@ -2039,6 +2040,7 @@ extern AVCodec flic_decoder;
extern AVCodec vmdvideo_decoder;
extern AVCodec vmdaudio_decoder;
extern AVCodec truemotion1_decoder;
extern AVCodec truemotion2_decoder;
extern AVCodec mszh_decoder;
extern AVCodec zlib_decoder;
extern AVCodec ra_144_decoder;
......
This diff is collapsed.
......@@ -188,6 +188,7 @@ const CodecTag codec_bmp_tags[] = {
{ CODEC_ID_INDEO2, MKTAG('R', 'T', '2', '1') },
{ CODEC_ID_FRAPS, MKTAG('F', 'P', 'S', '1') },
{ CODEC_ID_THEORA, MKTAG('t', 'h', 'e', 'o') },
{ CODEC_ID_TRUEMOTION2, MKTAG('T', 'M', '2', '0') },
{ CODEC_ID_RAWVIDEO, 0 },
{ 0, 0 },
};
......
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