From f28748e6718193e271aa8ff65b7ac92daca9f538 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 28 Sep 2006 22:03:52 +0000 Subject: [PATCH] remove extraneous #ifdef CONFIG_ENCODERS/DECODERS Originally committed as revision 6375 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/allcodecs.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3385092..bf8b052 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 -- 2.7.4