Browse Source

Fix compilation with --disable-decoders.

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

Originally committed as revision 5660 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Emiliano Parasassi Diego Biurrun 19 years ago
parent
commit
29c5cdcaec
3 changed files with 10 additions and 0 deletions
  1. +2
    -0
      libavcodec/allcodecs.c
  2. +4
    -0
      libavcodec/dsputil.c
  3. +4
    -0
      libavcodec/parser.c

+ 2
- 0
libavcodec/allcodecs.c View File

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


+ 4
- 0
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 */
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) {
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){
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[9]= biweight_h264_pixels2x2_c;

#ifdef CONFIG_CAVS_DECODER
ff_cavsdsp_init(c,avctx);
#endif

c->put_mspel_pixels_tab[0]= put_mspel8_mc00_c;
c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c;


+ 4
- 0
libavcodec/parser.c View File

@@ -534,6 +534,7 @@ static int mpeg4video_parse(AVCodecParserContext *s,
return next;
}

#ifdef CONFIG_CAVS_DECODER
static int cavsvideo_parse(AVCodecParserContext *s,
AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size,
@@ -557,6 +558,7 @@ static int cavsvideo_parse(AVCodecParserContext *s,
*poutbuf_size = buf_size;
return next;
}
#endif /* CONFIG_CAVS_DECODER */

static int mpeg4video_split(AVCodecContext *avctx,
const uint8_t *buf, int buf_size)
@@ -1012,6 +1014,7 @@ AVCodecParser mpeg4video_parser = {
mpeg4video_split,
};

#ifdef CONFIG_CAVS_DECODER
AVCodecParser cavsvideo_parser = {
{ CODEC_ID_CAVS },
sizeof(ParseContext1),
@@ -1020,6 +1023,7 @@ AVCodecParser cavsvideo_parser = {
parse1_close,
mpeg4video_split,
};
#endif

AVCodecParser mpegaudio_parser = {
{ CODEC_ID_MP2, CODEC_ID_MP3 },


Loading…
Cancel
Save