# HG changeset patch
# User michael
# Date 1115061978 0
# Node ID 00393c294d4dd38d2b5627772a74b5f924f5b1d6
# Parent  ef44d24680d1c96fb3ab7a0b078bb31291e919c1
#ifdefs around most register_avcodec

diff -r ef44d24680d1 -r 00393c294d4d allcodecs.c
--- a/allcodecs.c	Sat Apr 30 21:43:59 2005 +0000
+++ b/allcodecs.c	Mon May 02 19:26:18 2005 +0000
@@ -40,183 +40,463 @@
 
     /* encoders */
 #ifdef CONFIG_ENCODERS
+#ifdef CONFIG_AC3_ENCODER
     register_avcodec(&ac3_encoder);
+#endif //CONFIG_AC3_ENCODER
+#ifdef CONFIG_MP2_ENCODER
     register_avcodec(&mp2_encoder);
+#endif //CONFIG_MP2_ENCODER
 #ifdef CONFIG_MP3LAME
+#ifdef CONFIG_MP3LAME_ENCODER
     register_avcodec(&mp3lame_encoder);
+#endif //CONFIG_MP3LAME_ENCODER
 #endif
 #ifdef CONFIG_LIBVORBIS
+#ifdef CONFIG_OGGVORBIS_ENCODER
     register_avcodec(&oggvorbis_encoder);
+#endif //CONFIG_OGGVORBIS_ENCODER
+#ifdef CONFIG_OGGVORBIS_DECODER
     register_avcodec(&oggvorbis_decoder);
+#endif //CONFIG_OGGVORBIS_DECODER
 #endif
 #ifdef CONFIG_LIBTHEORA
+#ifdef CONFIG_OGGTHEORA_ENCODER
     register_avcodec(&oggtheora_encoder);
+#endif //CONFIG_OGGTHEORA_ENCODER
+#ifdef CONFIG_OGGTHEORA_DECODER
     register_avcodec(&oggtheora_decoder);
+#endif //CONFIG_OGGTHEORA_DECODER
 #endif
 #ifdef CONFIG_FAAC
+#ifdef CONFIG_FAAC_ENCODER
     register_avcodec(&faac_encoder);
+#endif //CONFIG_FAAC_ENCODER
 #endif
 #ifdef CONFIG_XVID
+#ifdef CONFIG_XVID_ENCODER
     register_avcodec(&xvid_encoder);
+#endif //CONFIG_XVID_ENCODER
 #endif
+#ifdef CONFIG_MPEG1VIDEO_ENCODER
     register_avcodec(&mpeg1video_encoder);
+#endif //CONFIG_MPEG1VIDEO_ENCODER
+#ifdef CONFIG_H264_ENCODER
 //    register_avcodec(&h264_encoder);
+#endif //CONFIG_H264_ENCODER
+#ifdef CONFIG_MPEG2VIDEO_ENCODER
     register_avcodec(&mpeg2video_encoder);
+#endif //CONFIG_MPEG2VIDEO_ENCODER
+#ifdef CONFIG_H261_ENCODER
     register_avcodec(&h261_encoder);
+#endif //CONFIG_H261_ENCODER
+#ifdef CONFIG_H263_ENCODER
     register_avcodec(&h263_encoder);
+#endif //CONFIG_H263_ENCODER
+#ifdef CONFIG_H263P_ENCODER
     register_avcodec(&h263p_encoder);
+#endif //CONFIG_H263P_ENCODER
+#ifdef CONFIG_FLV_ENCODER
     register_avcodec(&flv_encoder);
+#endif //CONFIG_FLV_ENCODER
+#ifdef CONFIG_RV10_ENCODER
     register_avcodec(&rv10_encoder);
+#endif //CONFIG_RV10_ENCODER
+#ifdef CONFIG_RV20_ENCODER
     register_avcodec(&rv20_encoder);
+#endif //CONFIG_RV20_ENCODER
+#ifdef CONFIG_MPEG4_ENCODER
     register_avcodec(&mpeg4_encoder);
+#endif //CONFIG_MPEG4_ENCODER
+#ifdef CONFIG_MSMPEG4V1_ENCODER
     register_avcodec(&msmpeg4v1_encoder);
+#endif //CONFIG_MSMPEG4V1_ENCODER
+#ifdef CONFIG_MSMPEG4V2_ENCODER
     register_avcodec(&msmpeg4v2_encoder);
+#endif //CONFIG_MSMPEG4V2_ENCODER
+#ifdef CONFIG_MSMPEG4V3_ENCODER
     register_avcodec(&msmpeg4v3_encoder);
+#endif //CONFIG_MSMPEG4V3_ENCODER
+#ifdef CONFIG_WMV1_ENCODER
     register_avcodec(&wmv1_encoder);
+#endif //CONFIG_WMV1_ENCODER
+#ifdef CONFIG_WMV2_ENCODER
     register_avcodec(&wmv2_encoder);
+#endif //CONFIG_WMV2_ENCODER
+#ifdef CONFIG_SVQ1_ENCODER
     register_avcodec(&svq1_encoder);
+#endif //CONFIG_SVQ1_ENCODER
+#ifdef CONFIG_MJPEG_ENCODER
     register_avcodec(&mjpeg_encoder);
+#endif //CONFIG_MJPEG_ENCODER
+#ifdef CONFIG_LJPEG_ENCODER
     register_avcodec(&ljpeg_encoder);
+#endif //CONFIG_LJPEG_ENCODER
 #ifdef CONFIG_ZLIB
+#ifdef CONFIG_PNG_ENCODER
     register_avcodec(&png_encoder);
+#endif //CONFIG_PNG_ENCODER
 #endif
+#ifdef CONFIG_PPM_ENCODER
     register_avcodec(&ppm_encoder);
+#endif //CONFIG_PPM_ENCODER
+#ifdef CONFIG_PGM_ENCODER
     register_avcodec(&pgm_encoder);
+#endif //CONFIG_PGM_ENCODER
+#ifdef CONFIG_PGMYUV_ENCODER
     register_avcodec(&pgmyuv_encoder);
+#endif //CONFIG_PGMYUV_ENCODER
+#ifdef CONFIG_PBM_ENCODER
     register_avcodec(&pbm_encoder);
+#endif //CONFIG_PBM_ENCODER
+#ifdef CONFIG_PAM_ENCODER
     register_avcodec(&pam_encoder);
+#endif //CONFIG_PAM_ENCODER
+#ifdef CONFIG_HUFFYUV_ENCODER
     register_avcodec(&huffyuv_encoder);
+#endif //CONFIG_HUFFYUV_ENCODER
+#ifdef CONFIG_FFVHUFF_ENCODER
     register_avcodec(&ffvhuff_encoder);
+#endif //CONFIG_FFVHUFF_ENCODER
+#ifdef CONFIG_ASV1_ENCODER
     register_avcodec(&asv1_encoder);
+#endif //CONFIG_ASV1_ENCODER
+#ifdef CONFIG_ASV2_ENCODER
     register_avcodec(&asv2_encoder);
+#endif //CONFIG_ASV2_ENCODER
+#ifdef CONFIG_FFV1_ENCODER
     register_avcodec(&ffv1_encoder);
+#endif //CONFIG_FFV1_ENCODER
+#ifdef CONFIG_SNOW_ENCODER
     register_avcodec(&snow_encoder);
+#endif //CONFIG_SNOW_ENCODER
+#ifdef CONFIG_ZLIB_ENCODER
     register_avcodec(&zlib_encoder);
+#endif //CONFIG_ZLIB_ENCODER
+#ifdef CONFIG_DVVIDEO_ENCODER
     register_avcodec(&dvvideo_encoder);
+#endif //CONFIG_DVVIDEO_ENCODER
+#ifdef CONFIG_SONIC_ENCODER
     register_avcodec(&sonic_encoder);
+#endif //CONFIG_SONIC_ENCODER
+#ifdef CONFIG_SONIC_LS_ENCODER
     register_avcodec(&sonic_ls_encoder);
+#endif //CONFIG_SONIC_LS_ENCODER
 #ifdef CONFIG_X264
+#ifdef CONFIG_X264_ENCODER
     register_avcodec(&x264_encoder);
+#endif //CONFIG_X264_ENCODER
 #endif
 #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
 
     /* decoders */
 #ifdef CONFIG_DECODERS
+#ifdef CONFIG_H263_DECODER
     register_avcodec(&h263_decoder);
+#endif //CONFIG_H263_DECODER
+#ifdef CONFIG_H261_DECODER
     register_avcodec(&h261_decoder);
+#endif //CONFIG_H261_DECODER
+#ifdef CONFIG_MPEG4_DECODER
     register_avcodec(&mpeg4_decoder);
+#endif //CONFIG_MPEG4_DECODER
+#ifdef CONFIG_MSMPEG4V1_DECODER
     register_avcodec(&msmpeg4v1_decoder);
+#endif //CONFIG_MSMPEG4V1_DECODER
+#ifdef CONFIG_MSMPEG4V2_DECODER
     register_avcodec(&msmpeg4v2_decoder);
+#endif //CONFIG_MSMPEG4V2_DECODER
+#ifdef CONFIG_MSMPEG4V3_DECODER
     register_avcodec(&msmpeg4v3_decoder);
+#endif //CONFIG_MSMPEG4V3_DECODER
+#ifdef CONFIG_WMV1_DECODER
     register_avcodec(&wmv1_decoder);
+#endif //CONFIG_WMV1_DECODER
+#ifdef CONFIG_WMV2_DECODER
     register_avcodec(&wmv2_decoder);
+#endif //CONFIG_WMV2_DECODER
+#ifdef CONFIG_VC9_DECODER
     register_avcodec(&vc9_decoder);
+#endif //CONFIG_VC9_DECODER
+#ifdef CONFIG_WMV3_DECODER
     register_avcodec(&wmv3_decoder);
+#endif //CONFIG_WMV3_DECODER
+#ifdef CONFIG_H263I_DECODER
     register_avcodec(&h263i_decoder);
+#endif //CONFIG_H263I_DECODER
+#ifdef CONFIG_FLV_DECODER
     register_avcodec(&flv_decoder);
+#endif //CONFIG_FLV_DECODER
+#ifdef CONFIG_RV10_DECODER
     register_avcodec(&rv10_decoder);
+#endif //CONFIG_RV10_DECODER
+#ifdef CONFIG_RV20_DECODER
     register_avcodec(&rv20_decoder);
+#endif //CONFIG_RV20_DECODER
+#ifdef CONFIG_SVQ1_DECODER
     register_avcodec(&svq1_decoder);
+#endif //CONFIG_SVQ1_DECODER
+#ifdef CONFIG_SVQ3_DECODER
     register_avcodec(&svq3_decoder);
+#endif //CONFIG_SVQ3_DECODER
+#ifdef CONFIG_WMAV1_DECODER
     register_avcodec(&wmav1_decoder);
+#endif //CONFIG_WMAV1_DECODER
+#ifdef CONFIG_WMAV2_DECODER
     register_avcodec(&wmav2_decoder);
+#endif //CONFIG_WMAV2_DECODER
+#ifdef CONFIG_INDEO2_DECODER
     register_avcodec(&indeo2_decoder);
+#endif //CONFIG_INDEO2_DECODER
+#ifdef CONFIG_INDEO3_DECODER
     register_avcodec(&indeo3_decoder);
+#endif //CONFIG_INDEO3_DECODER
+#ifdef CONFIG_TSCC_DECODER
     register_avcodec(&tscc_decoder);
+#endif //CONFIG_TSCC_DECODER
+#ifdef CONFIG_ULTI_DECODER
     register_avcodec(&ulti_decoder);
+#endif //CONFIG_ULTI_DECODER
+#ifdef CONFIG_QDRAW_DECODER
     register_avcodec(&qdraw_decoder);
+#endif //CONFIG_QDRAW_DECODER
+#ifdef CONFIG_XL_DECODER
     register_avcodec(&xl_decoder);
+#endif //CONFIG_XL_DECODER
+#ifdef CONFIG_QPEG_DECODER
     register_avcodec(&qpeg_decoder);
+#endif //CONFIG_QPEG_DECODER
+#ifdef CONFIG_LOCO_DECODER
     register_avcodec(&loco_decoder);
+#endif //CONFIG_LOCO_DECODER
+#ifdef CONFIG_WNV1_DECODER
     register_avcodec(&wnv1_decoder);
+#endif //CONFIG_WNV1_DECODER
+#ifdef CONFIG_AASC_DECODER
     register_avcodec(&aasc_decoder);
+#endif //CONFIG_AASC_DECODER
 #ifdef CONFIG_FAAD
+#ifdef CONFIG_AAC_DECODER
     register_avcodec(&aac_decoder);
+#endif //CONFIG_AAC_DECODER
+#ifdef CONFIG_MPEG4AAC_DECODER
     register_avcodec(&mpeg4aac_decoder);
+#endif //CONFIG_MPEG4AAC_DECODER
 #endif
+#ifdef CONFIG_MPEG1VIDEO_DECODER
     register_avcodec(&mpeg1video_decoder);
+#endif //CONFIG_MPEG1VIDEO_DECODER
+#ifdef CONFIG_MPEG2VIDEO_DECODER
     register_avcodec(&mpeg2video_decoder);
+#endif //CONFIG_MPEG2VIDEO_DECODER
+#ifdef CONFIG_MPEGVIDEO_DECODER
     register_avcodec(&mpegvideo_decoder);
+#endif //CONFIG_MPEGVIDEO_DECODER
 #ifdef HAVE_XVMC
+#ifdef CONFIG_MPEG_XVMC_DECODER
     register_avcodec(&mpeg_xvmc_decoder);
+#endif //CONFIG_MPEG_XVMC_DECODER
 #endif
+#ifdef CONFIG_DVVIDEO_DECODER
     register_avcodec(&dvvideo_decoder);
+#endif //CONFIG_DVVIDEO_DECODER
+#ifdef CONFIG_MJPEG_DECODER
     register_avcodec(&mjpeg_decoder);
+#endif //CONFIG_MJPEG_DECODER
+#ifdef CONFIG_MJPEGB_DECODER
     register_avcodec(&mjpegb_decoder);
+#endif //CONFIG_MJPEGB_DECODER
+#ifdef CONFIG_SP5X_DECODER
     register_avcodec(&sp5x_decoder);
+#endif //CONFIG_SP5X_DECODER
 #ifdef CONFIG_ZLIB
+#ifdef CONFIG_PNG_DECODER
     register_avcodec(&png_decoder);
+#endif //CONFIG_PNG_DECODER
 #endif
+#ifdef CONFIG_MP2_DECODER
     register_avcodec(&mp2_decoder);
+#endif //CONFIG_MP2_DECODER
+#ifdef CONFIG_MP3_DECODER
     register_avcodec(&mp3_decoder);
+#endif //CONFIG_MP3_DECODER
+#ifdef CONFIG_MP3ADU_DECODER
     register_avcodec(&mp3adu_decoder);
+#endif //CONFIG_MP3ADU_DECODER
+#ifdef CONFIG_MP3ON4_DECODER
     register_avcodec(&mp3on4_decoder);
+#endif //CONFIG_MP3ON4_DECODER
+#ifdef CONFIG_MACE3_DECODER
     register_avcodec(&mace3_decoder);
+#endif //CONFIG_MACE3_DECODER
+#ifdef CONFIG_MACE6_DECODER
     register_avcodec(&mace6_decoder);
+#endif //CONFIG_MACE6_DECODER
+#ifdef CONFIG_HUFFYUV_DECODER
     register_avcodec(&huffyuv_decoder);
+#endif //CONFIG_HUFFYUV_DECODER
+#ifdef CONFIG_FFVHUFF_DECODER
     register_avcodec(&ffvhuff_decoder);
+#endif //CONFIG_FFVHUFF_DECODER
+#ifdef CONFIG_FFV1_DECODER
     register_avcodec(&ffv1_decoder);
+#endif //CONFIG_FFV1_DECODER
+#ifdef CONFIG_SNOW_DECODER
     register_avcodec(&snow_decoder);
+#endif //CONFIG_SNOW_DECODER
+#ifdef CONFIG_CYUV_DECODER
     register_avcodec(&cyuv_decoder);
+#endif //CONFIG_CYUV_DECODER
+#ifdef CONFIG_H264_DECODER
     register_avcodec(&h264_decoder);
+#endif //CONFIG_H264_DECODER
+#ifdef CONFIG_VP3_DECODER
     register_avcodec(&vp3_decoder);
+#endif //CONFIG_VP3_DECODER
+#ifdef CONFIG_THEORA_DECODER
     register_avcodec(&theora_decoder);
+#endif //CONFIG_THEORA_DECODER
+#ifdef CONFIG_ASV1_DECODER
     register_avcodec(&asv1_decoder);
+#endif //CONFIG_ASV1_DECODER
+#ifdef CONFIG_ASV2_DECODER
     register_avcodec(&asv2_decoder);
+#endif //CONFIG_ASV2_DECODER
+#ifdef CONFIG_VCR1_DECODER
     register_avcodec(&vcr1_decoder);
+#endif //CONFIG_VCR1_DECODER
+#ifdef CONFIG_CLJR_DECODER
     register_avcodec(&cljr_decoder);
+#endif //CONFIG_CLJR_DECODER
+#ifdef CONFIG_FOURXM_DECODER
     register_avcodec(&fourxm_decoder);
+#endif //CONFIG_FOURXM_DECODER
+#ifdef CONFIG_MDEC_DECODER
     register_avcodec(&mdec_decoder);
+#endif //CONFIG_MDEC_DECODER
+#ifdef CONFIG_ROQ_DECODER
     register_avcodec(&roq_decoder);
+#endif //CONFIG_ROQ_DECODER
+#ifdef CONFIG_INTERPLAY_VIDEO_DECODER
     register_avcodec(&interplay_video_decoder);
+#endif //CONFIG_INTERPLAY_VIDEO_DECODER
+#ifdef CONFIG_XAN_WC3_DECODER
     register_avcodec(&xan_wc3_decoder);
+#endif //CONFIG_XAN_WC3_DECODER
+#ifdef CONFIG_RPZA_DECODER
     register_avcodec(&rpza_decoder);
+#endif //CONFIG_RPZA_DECODER
+#ifdef CONFIG_CINEPAK_DECODER
     register_avcodec(&cinepak_decoder);
+#endif //CONFIG_CINEPAK_DECODER
+#ifdef CONFIG_MSRLE_DECODER
     register_avcodec(&msrle_decoder);
+#endif //CONFIG_MSRLE_DECODER
+#ifdef CONFIG_MSVIDEO1_DECODER
     register_avcodec(&msvideo1_decoder);
+#endif //CONFIG_MSVIDEO1_DECODER
+#ifdef CONFIG_VQA_DECODER
     register_avcodec(&vqa_decoder);
+#endif //CONFIG_VQA_DECODER
+#ifdef CONFIG_IDCIN_DECODER
     register_avcodec(&idcin_decoder);
+#endif //CONFIG_IDCIN_DECODER
+#ifdef CONFIG_EIGHTBPS_DECODER
     register_avcodec(&eightbps_decoder);
+#endif //CONFIG_EIGHTBPS_DECODER
+#ifdef CONFIG_SMC_DECODER
     register_avcodec(&smc_decoder);
+#endif //CONFIG_SMC_DECODER
+#ifdef CONFIG_FLIC_DECODER
     register_avcodec(&flic_decoder);
+#endif //CONFIG_FLIC_DECODER
+#ifdef CONFIG_TRUEMOTION1_DECODER
     register_avcodec(&truemotion1_decoder);
+#endif //CONFIG_TRUEMOTION1_DECODER
+#ifdef CONFIG_VMDVIDEO_DECODER
     register_avcodec(&vmdvideo_decoder);
+#endif //CONFIG_VMDVIDEO_DECODER
+#ifdef CONFIG_VMDAUDIO_DECODER
     register_avcodec(&vmdaudio_decoder);
+#endif //CONFIG_VMDAUDIO_DECODER
+#ifdef CONFIG_MSZH_DECODER
     register_avcodec(&mszh_decoder);
+#endif //CONFIG_MSZH_DECODER
+#ifdef CONFIG_ZLIB_DECODER
     register_avcodec(&zlib_decoder);
+#endif //CONFIG_ZLIB_DECODER
+#ifdef CONFIG_SONIC_DECODER
     register_avcodec(&sonic_decoder);
+#endif //CONFIG_SONIC_DECODER
 #ifdef CONFIG_AC3
+#ifdef CONFIG_AC3_DECODER
     register_avcodec(&ac3_decoder);
+#endif //CONFIG_AC3_DECODER
 #endif
 #ifdef CONFIG_DTS
+#ifdef CONFIG_DTS_DECODER
     register_avcodec(&dts_decoder);
+#endif //CONFIG_DTS_DECODER
 #endif
+#ifdef CONFIG_RA_144_DECODER
     register_avcodec(&ra_144_decoder);
+#endif //CONFIG_RA_144_DECODER
+#ifdef CONFIG_RA_288_DECODER
     register_avcodec(&ra_288_decoder);
+#endif //CONFIG_RA_288_DECODER
+#ifdef CONFIG_ROQ_DPCM_DECODER
     register_avcodec(&roq_dpcm_decoder);
+#endif //CONFIG_ROQ_DPCM_DECODER
+#ifdef CONFIG_INTERPLAY_DPCM_DECODER
     register_avcodec(&interplay_dpcm_decoder);
+#endif //CONFIG_INTERPLAY_DPCM_DECODER
+#ifdef CONFIG_XAN_DPCM_DECODER
     register_avcodec(&xan_dpcm_decoder);
+#endif //CONFIG_XAN_DPCM_DECODER
+#ifdef CONFIG_SOL_DPCM_DECODER
     register_avcodec(&sol_dpcm_decoder);
+#endif //CONFIG_SOL_DPCM_DECODER
+#ifdef CONFIG_QTRLE_DECODER
     register_avcodec(&qtrle_decoder);
+#endif //CONFIG_QTRLE_DECODER
+#ifdef CONFIG_FLAC_DECODER
     register_avcodec(&flac_decoder);
+#endif //CONFIG_FLAC_DECODER
+#ifdef CONFIG_SHORTEN_DECODER
     register_avcodec(&shorten_decoder);
+#endif //CONFIG_SHORTEN_DECODER
+#ifdef CONFIG_ALAC_DECODER
     register_avcodec(&alac_decoder);
+#endif //CONFIG_ALAC_DECODER
+#ifdef CONFIG_WS_SND1_DECODER
     register_avcodec(&ws_snd1_decoder);
+#endif //CONFIG_WS_SND1_DECODER
 #endif /* CONFIG_DECODERS */
 
 #ifdef AMR_NB
+#ifdef CONFIG_AMR_NB_DECODER
     register_avcodec(&amr_nb_decoder);
+#endif //CONFIG_AMR_NB_DECODER
 #ifdef CONFIG_ENCODERS
+#ifdef CONFIG_AMR_NB_ENCODER
     register_avcodec(&amr_nb_encoder);
+#endif //CONFIG_AMR_NB_ENCODER
 #endif //CONFIG_ENCODERS
 #endif /* AMR_NB */
 
 #ifdef AMR_WB
+#ifdef CONFIG_AMR_WB_DECODER
     register_avcodec(&amr_wb_decoder);
+#endif //CONFIG_AMR_WB_DECODER
 #ifdef CONFIG_ENCODERS
+#ifdef CONFIG_AMR_WB_ENCODER
     register_avcodec(&amr_wb_encoder);
+#endif //CONFIG_AMR_WB_ENCODER
 #endif //CONFIG_ENCODERS
 #endif /* AMR_WB */