Commit deabd4fd authored by Mike Melanson's avatar Mike Melanson

native Indeo3 decoder implementation

Originally committed as revision 1777 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 96cbe82c
......@@ -21,7 +21,7 @@ ASM_OBJS=
# codecs which are patented in some non free countries like the us
ifeq ($(CONFIG_RISKY),yes)
OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o
OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
endif
# currently using liba52 for ac3 decoding
......
......@@ -82,6 +82,7 @@ void avcodec_register_all(void)
register_avcodec(&svq1_decoder);
register_avcodec(&wmav1_decoder);
register_avcodec(&wmav2_decoder);
register_avcodec(&indeo3_decoder);
#endif
register_avcodec(&mpeg_decoder);
register_avcodec(&dvvideo_decoder);
......
......@@ -50,6 +50,7 @@ enum CodecID {
CODEC_ID_HUFFYUV,
CODEC_ID_CYUV,
CODEC_ID_H264,
CODEC_ID_INDEO3,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE,
......@@ -1183,6 +1184,7 @@ extern AVCodec huffyuv_decoder;
extern AVCodec oggvorbis_decoder;
extern AVCodec cyuv_decoder;
extern AVCodec h264_decoder;
extern AVCodec indeo3_decoder;
/* pcm codecs */
#define PCM_CODEC(id, name) \
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -142,6 +142,10 @@ const CodecTag codec_bmp_tags[] = {
{ CODEC_ID_CYUV, MKTAG('c', 'y', 'u', 'v') },
{ CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '2', '2') },
{ CODEC_ID_RAWVIDEO, MKTAG('I', '4', '2', '0') },
{ CODEC_ID_INDEO3, MKTAG('i', 'v', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('i', 'v', '3', '2') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },
{ CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
{ 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