Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv4574/libavcodec Modified Files: allcodecs.c Log Message: avoid the registration of DECODERS if only CONFIG_DECODERS is not defined. patch by Emiliano Parassassi < millallo AH tiscali -- it > Original thread: Date: Mon, 24 Oct 2005 13:03:01 +0200 Subject: [Ffmpeg-devel] [PATCH] avoid registration of decoders if only encoders are choosed Index: allcodecs.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/allcodecs.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- allcodecs.c 18 Oct 2005 20:16:42 -0000 1.112 +++ allcodecs.c 26 Oct 2005 12:51:10 -0000 1.113 @@ -189,13 +189,10 @@ #ifdef CONFIG_LIBGSM register_avcodec(&libgsm_encoder); #endif //CONFIG_LIBGSM -#endif /* CONFIG_ENCODERS */ #ifdef CONFIG_RAWVIDEO_ENCODER register_avcodec(&rawvideo_encoder); #endif //CONFIG_RAWVIDEO_ENCODER -#ifdef CONFIG_RAWVIDEO_DECODER - register_avcodec(&rawvideo_decoder); -#endif //CONFIG_RAWVIDEO_DECODER +#endif /* CONFIG_ENCODERS */ /* decoders */ #ifdef CONFIG_DECODERS @@ -494,6 +491,9 @@ #ifdef CONFIG_QDM2_DECODER register_avcodec(&qdm2_decoder); #endif //CONFIG_QDM2_DECODER +#ifdef CONFIG_RAWVIDEO_DECODER + register_avcodec(&rawvideo_decoder); +#endif //CONFIG_RAWVIDEO_DECODER #endif /* CONFIG_DECODERS */ #ifdef AMR_NB @@ -519,15 +519,16 @@ #endif /* AMR_WB */ /* pcm codecs */ - -#ifdef CONFIG_ENCODERS -#define PCM_CODEC(id, name) \ - register_avcodec(& name ## _encoder); \ - register_avcodec(& name ## _decoder); \ - -#else -#define PCM_CODEC(id, name) \ - register_avcodec(& name ## _decoder); +#if defined (CONFIG_ENCODERS) && defined (CONFIG_DECODERS) + #define PCM_CODEC(id, name) \ + register_avcodec(& name ## _encoder); \ + register_avcodec(& name ## _decoder); +#elif defined (CONFIG_ENCODERS) + #define PCM_CODEC(id, name) \ + register_avcodec(& name ## _encoder); +#elif defined (CONFIG_DECODERS) + #define PCM_CODEC(id, name) \ + register_avcodec(& name ## _decoder); #endif PCM_CODEC(CODEC_ID_PCM_S32LE, pcm_s32le); @@ -564,13 +565,17 @@ PCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct); PCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf); PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha); - #undef PCM_CODEC - /* subtitles */ - register_avcodec(&dvdsub_decoder); + /* subtitles */ +#ifdef CONFIG_ENCODERS register_avcodec(&dvbsub_encoder); +#endif + +#ifdef CONFIG_DECODERS + register_avcodec(&dvdsub_decoder); register_avcodec(&dvbsub_decoder); +#endif /* parsers */ av_register_codec_parser(&mpegvideo_parser);