[Ffmpeg-devel] [PATCH] fix compilation with cavs decoder

Reimar Döffinger Reimar.Doeffinger
Mon Jul 3 18:46:21 CEST 2006


Hello,
adds a few necessary #ifdefs. No idea if completely disabling the parser
is a good idea or not.

Greetings,
Reimar D?ffinger
-------------- next part --------------
Index: libavcodec/dsputil.c
===================================================================
--- libavcodec/dsputil.c	(revision 5598)
+++ libavcodec/dsputil.c	(working copy)
@@ -4005,7 +4005,9 @@
     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;
Index: libavcodec/allcodecs.c
===================================================================
--- libavcodec/allcodecs.c	(revision 5598)
+++ libavcodec/allcodecs.c	(working copy)
@@ -640,7 +638,9 @@
     /* 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
Index: libavcodec/parser.c
===================================================================
--- libavcodec/parser.c	(revision 5598)
+++ libavcodec/parser.c	(working copy)
@@ -533,6 +533,7 @@
     return next;
 }
 
+#ifdef CONFIG_CAVS_DECODER
 static int cavsvideo_parse(AVCodecParserContext *s,
                            AVCodecContext *avctx,
                            uint8_t **poutbuf, int *poutbuf_size,
@@ -556,6 +557,7 @@
     *poutbuf_size = buf_size;
     return next;
 }
+#endif
 
 static int mpeg4video_split(AVCodecContext *avctx,
                            const uint8_t *buf, int buf_size)
@@ -1011,6 +1013,7 @@
     mpeg4video_split,
 };
 
+#ifdef CONFIG_CAVS_DECODER
 AVCodecParser cavsvideo_parser = {
     { CODEC_ID_CAVS },
     sizeof(ParseContext1),
@@ -1019,6 +1022,7 @@
     parse1_close,
     mpeg4video_split,
 };
+#endif
 
 AVCodecParser mpegaudio_parser = {
     { CODEC_ID_MP2, CODEC_ID_MP3 },



More information about the ffmpeg-devel mailing list