Originally committed as revision 1831 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -16,7 +16,8 @@ OBJS= common.o utils.o mem.o allcodecs.o \ | |||||
| motion_est.o imgconvert.o imgresample.o \ | motion_est.o imgconvert.o imgresample.o \ | ||||
| mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \ | mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \ | ||||
| ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \ | ratecontrol.o adpcm.o eval.o dv.o error_resilience.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 | |||||
| ASM_OBJS= | ASM_OBJS= | ||||
| # codecs which are patented in some non free countries like the us | # codecs which are patented in some non free countries like the us | ||||
| @@ -96,6 +96,7 @@ void avcodec_register_all(void) | |||||
| register_avcodec(&huffyuv_decoder); | register_avcodec(&huffyuv_decoder); | ||||
| register_avcodec(&cyuv_decoder); | register_avcodec(&cyuv_decoder); | ||||
| register_avcodec(&h264_decoder); | register_avcodec(&h264_decoder); | ||||
| register_avcodec(&vp3_decoder); | |||||
| #ifdef CONFIG_AC3 | #ifdef CONFIG_AC3 | ||||
| register_avcodec(&ac3_decoder); | register_avcodec(&ac3_decoder); | ||||
| #endif | #endif | ||||
| @@ -51,6 +51,7 @@ enum CodecID { | |||||
| CODEC_ID_CYUV, | CODEC_ID_CYUV, | ||||
| CODEC_ID_H264, | CODEC_ID_H264, | ||||
| CODEC_ID_INDEO3, | CODEC_ID_INDEO3, | ||||
| CODEC_ID_VP3, | |||||
| /* various pcm "codecs" */ | /* various pcm "codecs" */ | ||||
| CODEC_ID_PCM_S16LE, | CODEC_ID_PCM_S16LE, | ||||
| @@ -1218,6 +1219,7 @@ extern AVCodec oggvorbis_decoder; | |||||
| extern AVCodec cyuv_decoder; | extern AVCodec cyuv_decoder; | ||||
| extern AVCodec h264_decoder; | extern AVCodec h264_decoder; | ||||
| extern AVCodec indeo3_decoder; | extern AVCodec indeo3_decoder; | ||||
| extern AVCodec vp3_decoder; | |||||
| /* pcm codecs */ | /* pcm codecs */ | ||||
| #define PCM_CODEC(id, name) \ | #define PCM_CODEC(id, name) \ | ||||
| @@ -162,6 +162,7 @@ const CodecTag codec_bmp_tags[] = { | |||||
| { CODEC_ID_INDEO3, MKTAG('i', 'v', '3', '2') }, | { CODEC_ID_INDEO3, MKTAG('i', 'v', '3', '2') }, | ||||
| { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, | { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, | ||||
| { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, | { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, | ||||
| { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, | |||||
| { 0, 0 }, | { 0, 0 }, | ||||
| }; | }; | ||||
| @@ -115,6 +115,7 @@ static const CodecTag mov_video_tags[] = { | |||||
| { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ | { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */ | ||||
| { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ | { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */ | ||||
| /* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */ | /* { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, *//* AVID dv */ | ||||
| { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */ | |||||
| { 0, 0 }, | { 0, 0 }, | ||||
| }; | }; | ||||