har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extraneous #ifdef CONFIG_ENCODERS/DECODERS

Browse Source 
Originally committed as revision 6375 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-09-28 22:03:52 +00:00
parent 3841e813dc
commit f28748e671
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/allcodecs.c
View File

@ -39,7 +39,6 @@ void avcodec_register_all(void)
inited = 1; inited = 1;
/* encoders */ /* encoders */
#ifdef CONFIG_ENCODERS
#ifdef CONFIG_AC3_ENCODER #ifdef CONFIG_AC3_ENCODER
register_avcodec(&ac3_encoder); register_avcodec(&ac3_encoder);
#endif //CONFIG_AC3_ENCODER #endif //CONFIG_AC3_ENCODER
@ -190,10 +189,8 @@ void avcodec_register_all(void)
#ifdef CONFIG_RAWVIDEO_ENCODER #ifdef CONFIG_RAWVIDEO_ENCODER
register_avcodec(&rawvideo_encoder); register_avcodec(&rawvideo_encoder);
#endif //CONFIG_RAWVIDEO_ENCODER #endif //CONFIG_RAWVIDEO_ENCODER
#endif /* CONFIG_ENCODERS */
/* decoders */ /* decoders */
#ifdef CONFIG_DECODERS
#ifdef CONFIG_H263_DECODER #ifdef CONFIG_H263_DECODER
register_avcodec(&h263_decoder); register_avcodec(&h263_decoder);
#endif //CONFIG_H263_DECODER #endif //CONFIG_H263_DECODER
@ -543,28 +540,23 @@ void avcodec_register_all(void)
#ifdef CONFIG_WAVPACK_DECODER #ifdef CONFIG_WAVPACK_DECODER
register_avcodec(&wavpack_decoder); register_avcodec(&wavpack_decoder);
#endif //CONFIG_WAVPACK_DECODER #endif //CONFIG_WAVPACK_DECODER
#endif /* CONFIG_DECODERS */
#if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED)
#ifdef CONFIG_AMR_NB_DECODER #ifdef CONFIG_AMR_NB_DECODER
register_avcodec(&amr_nb_decoder); register_avcodec(&amr_nb_decoder);
#endif //CONFIG_AMR_NB_DECODER #endif //CONFIG_AMR_NB_DECODER
#ifdef CONFIG_ENCODERS
#ifdef CONFIG_AMR_NB_ENCODER #ifdef CONFIG_AMR_NB_ENCODER
register_avcodec(&amr_nb_encoder); register_avcodec(&amr_nb_encoder);
#endif //CONFIG_AMR_NB_ENCODER #endif //CONFIG_AMR_NB_ENCODER
#endif //CONFIG_ENCODERS
#endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */ #endif /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */
#ifdef CONFIG_AMR_WB #ifdef CONFIG_AMR_WB
#ifdef CONFIG_AMR_WB_DECODER #ifdef CONFIG_AMR_WB_DECODER
register_avcodec(&amr_wb_decoder); register_avcodec(&amr_wb_decoder);
#endif //CONFIG_AMR_WB_DECODER #endif //CONFIG_AMR_WB_DECODER
#ifdef CONFIG_ENCODERS
#ifdef CONFIG_AMR_WB_ENCODER #ifdef CONFIG_AMR_WB_ENCODER
register_avcodec(&amr_wb_encoder); register_avcodec(&amr_wb_encoder);
#endif //CONFIG_AMR_WB_ENCODER #endif //CONFIG_AMR_WB_ENCODER
#endif //CONFIG_ENCODERS
#endif /* CONFIG_AMR_WB */ #endif /* CONFIG_AMR_WB */
#ifdef CONFIG_BMP_DECODER #ifdef CONFIG_BMP_DECODER