diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-09-28 22:03:52 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-09-28 22:03:52 +0000 |
| commit | f28748e6718193e271aa8ff65b7ac92daca9f538 (patch) | |
| tree | f0864772ca86458ac157f7c88a1ac5b63f6892f9 /libavcodec/allcodecs.c | |
| parent | 3841e813dcd8c52f25d4d1bf8e1e22f3d87c50c2 (diff) | |
remove extraneous #ifdef CONFIG_ENCODERS/DECODERS
Originally committed as revision 6375 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
| -rw-r--r-- | libavcodec/allcodecs.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3385092ca9..bf8b052930 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -39,7 +39,6 @@ void avcodec_register_all(void) inited = 1; /* encoders */ -#ifdef CONFIG_ENCODERS #ifdef CONFIG_AC3_ENCODER register_avcodec(&ac3_encoder); #endif //CONFIG_AC3_ENCODER @@ -190,10 +189,8 @@ void avcodec_register_all(void) #ifdef CONFIG_RAWVIDEO_ENCODER register_avcodec(&rawvideo_encoder); #endif //CONFIG_RAWVIDEO_ENCODER -#endif /* CONFIG_ENCODERS */ /* decoders */ -#ifdef CONFIG_DECODERS #ifdef CONFIG_H263_DECODER register_avcodec(&h263_decoder); #endif //CONFIG_H263_DECODER @@ -543,28 +540,23 @@ void avcodec_register_all(void) #ifdef CONFIG_WAVPACK_DECODER register_avcodec(&wavpack_decoder); #endif //CONFIG_WAVPACK_DECODER -#endif /* CONFIG_DECODERS */ #if defined(CONFIG_AMR_NB) || defined(CONFIG_AMR_NB_FIXED) #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 /* CONFIG_AMR_NB || CONFIG_AMR_NB_FIXED */ #ifdef CONFIG_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 /* CONFIG_AMR_WB */ #ifdef CONFIG_BMP_DECODER |