mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
native Indeo3 decoder implementation
Originally committed as revision 1777 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
96cbe82cb5
commit
deabd4fdde
@ -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) \
|
||||
|
1210
libavcodec/indeo3.c
Normal file
1210
libavcodec/indeo3.c
Normal file
File diff suppressed because it is too large
Load Diff
2315
libavcodec/indeo3data.h
Normal file
2315
libavcodec/indeo3data.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -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 },
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user