X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fallcodecs.c;h=f348617c05d1796ec2c6b3f6391e0cb9b5a985e9;hb=3f6d6af66e876ebfa263513a7b5834e1f90b785b;hp=d7aa1e0a29b305764842b83b88f6097c3c6b271b;hpb=9fa62f2aade4ded0ef64ae8c5012ab933d8ad64d;p=ffmpeg diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index d7aa1e0a29b..f348617c05d 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** @@ -28,14 +28,14 @@ formats you want to support */ /** - * simple call to register all the codecs. + * simple call to register all the codecs. */ void avcodec_register_all(void) { static int inited = 0; - + if (inited != 0) - return; + return; inited = 1; /* encoders */ @@ -72,6 +72,9 @@ void avcodec_register_all(void) register_avcodec(&faac_encoder); #endif //CONFIG_FAAC_ENCODER #endif +#ifdef CONFIG_FLAC_ENCODER + register_avcodec(&flac_encoder); +#endif #ifdef CONFIG_XVID #ifdef CONFIG_XVID_ENCODER register_avcodec(&xvid_encoder); @@ -131,6 +134,9 @@ void avcodec_register_all(void) #ifdef CONFIG_LJPEG_ENCODER register_avcodec(&ljpeg_encoder); #endif //CONFIG_LJPEG_ENCODER +#ifdef CONFIG_JPEGLS_ENCODER + register_avcodec(&jpegls_encoder); +#endif //CONFIG_JPEGLS_ENCODER #ifdef CONFIG_ZLIB #ifdef CONFIG_PNG_ENCODER register_avcodec(&png_encoder); @@ -220,12 +226,14 @@ void avcodec_register_all(void) #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_VC1_DECODER + register_avcodec(&vc1_decoder); +#endif //CONFIG_VC1_DECODER +/* Reenable when it stops crashing on every file, causing bug report spam. #ifdef CONFIG_WMV3_DECODER register_avcodec(&wmv3_decoder); #endif //CONFIG_WMV3_DECODER +*/ #ifdef CONFIG_H263I_DECODER register_avcodec(&h263i_decoder); #endif //CONFIG_H263I_DECODER @@ -259,6 +267,12 @@ void avcodec_register_all(void) #ifdef CONFIG_TSCC_DECODER register_avcodec(&tscc_decoder); #endif //CONFIG_TSCC_DECODER +#ifdef CONFIG_CSCD_DECODER + register_avcodec(&cscd_decoder); +#endif //CONFIG_CSCD_DECODER +#ifdef CONFIG_NUV_DECODER + register_avcodec(&nuv_decoder); +#endif //CONFIG_NUV_DECODER #ifdef CONFIG_ULTI_DECODER register_avcodec(&ulti_decoder); #endif //CONFIG_ULTI_DECODER @@ -274,6 +288,9 @@ void avcodec_register_all(void) #ifdef CONFIG_LOCO_DECODER register_avcodec(&loco_decoder); #endif //CONFIG_LOCO_DECODER +#ifdef CONFIG_KMVC_DECODER + register_avcodec(&kmvc_decoder); +#endif //CONFIG_KMVC_DECODER #ifdef CONFIG_WNV1_DECODER register_avcodec(&wnv1_decoder); #endif //CONFIG_WNV1_DECODER @@ -436,6 +453,15 @@ void avcodec_register_all(void) #ifdef CONFIG_ZLIB_DECODER register_avcodec(&zlib_decoder); #endif //CONFIG_ZLIB_DECODER +#ifdef CONFIG_ZMBV_DECODER + register_avcodec(&zmbv_decoder); +#endif //CONFIG_ZMBV_DECODER +#ifdef CONFIG_SMACKER_DECODER + register_avcodec(&smacker_decoder); +#endif //CONFIG_SMACKER_DECODER +#ifdef CONFIG_SMACKAUD_DECODER + register_avcodec(&smackaud_decoder); +#endif //CONFIG_SMACKAUD_DECODER #ifdef CONFIG_SONIC_DECODER register_avcodec(&sonic_decoder); #endif //CONFIG_SONIC_DECODER @@ -491,12 +517,27 @@ void avcodec_register_all(void) #ifdef CONFIG_QDM2_DECODER register_avcodec(&qdm2_decoder); #endif //CONFIG_QDM2_DECODER +#ifdef CONFIG_COOK_DECODER + register_avcodec(&cook_decoder); +#endif //CONFIG_COOK_DECODER +#ifdef CONFIG_TRUESPEECH_DECODER + register_avcodec(&truespeech_decoder); +#endif //CONFIG_TRUESPEECH_DECODER +#ifdef CONFIG_TTA_DECODER + register_avcodec(&tta_decoder); +#endif //CONFIG_TTA_DECODER +#ifdef CONFIG_AVS_DECODER + register_avcodec(&avs_decoder); +#endif //CONFIG_AVS_DECODER #ifdef CONFIG_RAWVIDEO_DECODER register_avcodec(&rawvideo_decoder); #endif //CONFIG_RAWVIDEO_DECODER +#ifdef CONFIG_FLASHSV_DECODER + register_avcodec(&flashsv_decoder); +#endif //CONFIG_FLASHSV_DECODER #endif /* CONFIG_DECODERS */ -#ifdef AMR_NB +#if defined(AMR_NB) || defined(AMR_NB_FIXED) #ifdef CONFIG_AMR_NB_DECODER register_avcodec(&amr_nb_decoder); #endif //CONFIG_AMR_NB_DECODER @@ -505,7 +546,7 @@ void avcodec_register_all(void) register_avcodec(&amr_nb_encoder); #endif //CONFIG_AMR_NB_ENCODER #endif //CONFIG_ENCODERS -#endif /* AMR_NB */ +#endif /* AMR_NB || AMR_NB_FIXED */ #ifdef AMR_WB #ifdef CONFIG_AMR_WB_DECODER @@ -522,6 +563,10 @@ void avcodec_register_all(void) register_avcodec(&bmp_decoder); #endif +#if CONFIG_MMVIDEO_DECODER + register_avcodec(&mmvideo_decoder); +#endif //CONFIG_MMVIDEO_DECODER + /* pcm codecs */ #if defined (CONFIG_ENCODERS) && defined (CONFIG_DECODERS) #define PCM_CODEC(id, name) \ @@ -569,6 +614,9 @@ PCM_CODEC(CODEC_ID_ADPCM_G726, adpcm_g726); PCM_CODEC(CODEC_ID_ADPCM_CT, adpcm_ct); PCM_CODEC(CODEC_ID_ADPCM_SWF, adpcm_swf); PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha); +PCM_CODEC(CODEC_ID_ADPCM_SBPRO_4, adpcm_sbpro_4); +PCM_CODEC(CODEC_ID_ADPCM_SBPRO_3, adpcm_sbpro_3); +PCM_CODEC(CODEC_ID_ADPCM_SBPRO_2, adpcm_sbpro_2); #undef PCM_CODEC /* subtitles */ @@ -586,7 +634,7 @@ PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha); register_avcodec(&dvbsub_encoder); #endif - /* parsers */ + /* parsers */ av_register_codec_parser(&mpegvideo_parser); av_register_codec_parser(&mpeg4video_parser); #if defined(CONFIG_H261_DECODER) || defined(CONFIG_H261_ENCODER) @@ -600,9 +648,7 @@ PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha); av_register_codec_parser(&pnm_parser); av_register_codec_parser(&mpegaudio_parser); -#ifdef CONFIG_AC3 av_register_codec_parser(&ac3_parser); -#endif #ifdef CONFIG_DVDSUB_DECODER av_register_codec_parser(&dvdsub_parser); @@ -610,5 +656,6 @@ PCM_CODEC(CODEC_ID_ADPCM_YAMAHA, adpcm_yamaha); #ifdef CONFIG_DVBSUB_DECODER av_register_codec_parser(&dvbsub_parser); #endif + av_register_codec_parser(&aac_parser); }