[SCM] libav/experimental: Fix compilation with --disable-decoders. patch by Emiliano Parasassi, millallo --at-- gmail --dot-- com

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 29c5cdcaec66b3e2a783eb1d34bdb8cba5d9192f
Author: Emiliano Parasassi <millallo at gmail.com>
Date:   Fri Jul 7 11:08:58 2006 +0000

    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

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 81e5204..6138b55 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -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
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index f85794b..5c22184 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -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;
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 4944b3a..2c91049 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -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 },

-- 
Libav/FFmpeg packaging