eden-emu/FFmpeg
15
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-03 10:27:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compilation with --disable-decoders.

Browse source 
patch by Emiliano Parasassi, millallo --at-- gmail --dot-- com

Originally committed as revision 5660 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Emiliano Parasassi 2006-07-07 11:08:58 +00:00 • committed by Diego Biurrun
parent 6a09487edc
commit 29c5cdcaec
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/allcodecs.c
View file

@ -640,7 +640,9 @@ PCM_CODEC(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2);
/* parsers */ /* parsers */
av_register_codec_parser(&mpegvideo_parser); av_register_codec_parser(&mpegvideo_parser);
av_register_codec_parser(&mpeg4video_parser); av_register_codec_parser(&mpeg4video_parser);
#ifdef CONFIG_CAVS_DECODER
av_register_codec_parser(&cavsvideo_parser); av_register_codec_parser(&cavsvideo_parser);
#endif
#if defined(CONFIG_H261_DECODER) || defined(CONFIG_H261_ENCODER) #if defined(CONFIG_H261_DECODER) || defined(CONFIG_H261_ENCODER)
av_register_codec_parser(&h261_parser); av_register_codec_parser(&h261_parser);
#endif #endif

4
libavcodec/dsputil.c
View file

@ -2570,6 +2570,7 @@ static void wmv2_mspel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int
} }
} }
#ifdef CONFIG_CAVS_DECODER
/* AVS specific */ /* AVS specific */
void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx); void ff_cavsdsp_init(DSPContext* c, AVCodecContext *avctx);
@ -2585,6 +2586,7 @@ void ff_put_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) {
void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) { void ff_avg_cavs_qpel16_mc00_c(uint8_t *dst, uint8_t *src, int stride) {
avg_pixels16_c(dst, src, stride, 16); avg_pixels16_c(dst, src, stride, 16);
} }
#endif /* CONFIG_CAVS_DECODER */
static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){ static void wmv2_mspel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int w){
uint8_t *cm = cropTbl + MAX_NEG_CROP; uint8_t *cm = cropTbl + MAX_NEG_CROP;
@ -4005,7 +4007,9 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
c->biweight_h264_pixels_tab[8]= biweight_h264_pixels2x4_c; c->biweight_h264_pixels_tab[8]= biweight_h264_pixels2x4_c;
c->biweight_h264_pixels_tab[9]= biweight_h264_pixels2x2_c; c->biweight_h264_pixels_tab[9]= biweight_h264_pixels2x2_c;
#ifdef CONFIG_CAVS_DECODER
ff_cavsdsp_init(c,avctx); ff_cavsdsp_init(c,avctx);
#endif
c->put_mspel_pixels_tab[0]= put_mspel8_mc00_c; c->put_mspel_pixels_tab[0]= put_mspel8_mc00_c;
c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c;

4
libavcodec/parser.c
View file

@ -534,6 +534,7 @@ static int mpeg4video_parse(AVCodecParserContext *s,
return next; return next;
} }
#ifdef CONFIG_CAVS_DECODER
static int cavsvideo_parse(AVCodecParserContext *s, static int cavsvideo_parse(AVCodecParserContext *s,
AVCodecContext *avctx, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size, uint8_t **poutbuf, int *poutbuf_size,
@ -557,6 +558,7 @@ static int cavsvideo_parse(AVCodecParserContext *s,
*poutbuf_size = buf_size; *poutbuf_size = buf_size;
return next; return next;
} }
#endif /* CONFIG_CAVS_DECODER */
static int mpeg4video_split(AVCodecContext *avctx, static int mpeg4video_split(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
@ -1012,6 +1014,7 @@ AVCodecParser mpeg4video_parser = {
mpeg4video_split, mpeg4video_split,
}; };
#ifdef CONFIG_CAVS_DECODER
AVCodecParser cavsvideo_parser = { AVCodecParser cavsvideo_parser = {
{ CODEC_ID_CAVS }, { CODEC_ID_CAVS },
sizeof(ParseContext1), sizeof(ParseContext1),
@ -1020,6 +1023,7 @@ AVCodecParser cavsvideo_parser = {
parse1_close, parse1_close,
mpeg4video_split, mpeg4video_split,
}; };
#endif
AVCodecParser mpegaudio_parser = { AVCodecParser mpegaudio_parser = {
{ CODEC_ID_MP2, CODEC_ID_MP3 }, { CODEC_ID_MP2, CODEC_ID_MP3 },