Commit e8725868 authored by melanson's avatar melanson

added Apple Graphics (SMC) decoder


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2488 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5283b12b
...@@ -18,7 +18,8 @@ OBJS= common.o utils.o mem.o allcodecs.o \ ...@@ -18,7 +18,8 @@ OBJS= common.o utils.o mem.o allcodecs.o \
fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \ fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \ vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \ roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
smc.o
ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB),yes)
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
......
...@@ -135,6 +135,7 @@ void avcodec_register_all(void) ...@@ -135,6 +135,7 @@ void avcodec_register_all(void)
register_avcodec(&vqa_decoder); register_avcodec(&vqa_decoder);
register_avcodec(&idcin_decoder); register_avcodec(&idcin_decoder);
register_avcodec(&eightbps_decoder); register_avcodec(&eightbps_decoder);
register_avcodec(&smc_decoder);
#ifdef CONFIG_AC3 #ifdef CONFIG_AC3
register_avcodec(&ac3_decoder); register_avcodec(&ac3_decoder);
#endif #endif
......
...@@ -84,6 +84,7 @@ enum CodecID { ...@@ -84,6 +84,7 @@ enum CodecID {
CODEC_ID_MSVIDEO1, CODEC_ID_MSVIDEO1,
CODEC_ID_IDCIN, CODEC_ID_IDCIN,
CODEC_ID_8BPS, CODEC_ID_8BPS,
CODEC_ID_SMC,
/* various pcm "codecs" */ /* various pcm "codecs" */
CODEC_ID_PCM_S16LE, CODEC_ID_PCM_S16LE,
...@@ -1568,6 +1569,7 @@ extern AVCodec msvideo1_decoder; ...@@ -1568,6 +1569,7 @@ extern AVCodec msvideo1_decoder;
extern AVCodec vqa_decoder; extern AVCodec vqa_decoder;
extern AVCodec idcin_decoder; extern AVCodec idcin_decoder;
extern AVCodec eightbps_decoder; extern AVCodec eightbps_decoder;
extern AVCodec smc_decoder;
extern AVCodec ra_144_decoder; extern AVCodec ra_144_decoder;
extern AVCodec ra_288_decoder; extern AVCodec ra_288_decoder;
extern AVCodec roq_dpcm_decoder; extern AVCodec roq_dpcm_decoder;
......
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