Replace generic CONFIG_DECODERS preprocessor conditionals by more specific

CONFIG_FOO_DECODER conditionals where appropriate.

Originally committed as revision 15162 to svn://svn.ffmpeg.org/ffmpeg/trunk

3 files changed, 14 insertions, 12 deletions

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 71022463af..876e93fe64 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -1019,7 +1019,7 @@ static int dv_encode_mt(AVCodecContext *avctx, void* sl)
 }
 #endif
 
-#ifdef CONFIG_DECODERS
+#ifdef CONFIG_DVVIDEO_DECODER
 /* NOTE: exactly one frame must be given (120000 bytes for NTSC,
    144000 bytes for PAL - or twice those for 50Mbps) */
 static int dvvideo_decode_frame(AVCodecContext *avctx,
@@ -1060,7 +1060,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
 
     return s->sys->frame_size;
 }
-#endif
+#endif /* CONFIG_DVVIDEO_DECODER */
 
 
 static inline int dv_write_pack(enum dv_pack_type pack_id, DVVideoContext *c, uint8_t* buf)
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index 83b1053fad..b262cd66f1 100644
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -477,7 +477,7 @@ static int common_init(AVCodecContext *avctx){
     return 0;
 }
 
-#ifdef CONFIG_DECODERS
+#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER)
 static av_cold int decode_init(AVCodecContext *avctx)
 {
     HYuvContext *s = avctx->priv_data;
@@ -573,7 +573,7 @@ s->bgr32=1;
 
     return 0;
 }
-#endif
+#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */
 
 #ifdef CONFIG_ENCODERS
 static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){
@@ -931,7 +931,7 @@ static int encode_bgr_bitstream(HYuvContext *s, int count){
     return 0;
 }
 
-#ifdef CONFIG_DECODERS
+#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER)
 static void draw_slice(HYuvContext *s, int y){
     int h, cy;
     int offset[4];
@@ -1198,7 +1198,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const
 
     return (get_bits_count(&s->gb)+31)/32*4 + table_size;
 }
-#endif
+#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */
 
 static int common_end(HYuvContext *s){
     int i;
@@ -1209,7 +1209,7 @@ static int common_end(HYuvContext *s){
     return 0;
 }
 
-#ifdef CONFIG_DECODERS
+#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER)
 static av_cold int decode_end(AVCodecContext *avctx)
 {
     HYuvContext *s = avctx->priv_data;
@@ -1224,7 +1224,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
 
     return 0;
 }
-#endif
+#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */
 
 #ifdef CONFIG_ENCODERS
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
@@ -1433,7 +1433,7 @@ static av_cold int encode_end(AVCodecContext *avctx)
 }
 #endif /* CONFIG_ENCODERS */
 
-#ifdef CONFIG_DECODERS
+#ifdef CONFIG_HUFFYUV_DECODER
 AVCodec huffyuv_decoder = {
     "huffyuv",
     CODEC_TYPE_VIDEO,
@@ -1447,7 +1447,9 @@ AVCodec huffyuv_decoder = {
     NULL,
     .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
 };
+#endif
 
+#ifdef CONFIG_FFVHUFF_DECODER
 AVCodec ffvhuff_decoder = {
     "ffvhuff",
     CODEC_TYPE_VIDEO,
diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 60d36a5891..d8bae3af3d 100644
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -750,7 +750,7 @@ static int sonic_encode_frame(AVCodecContext *avctx,
 }
 #endif //CONFIG_ENCODERS
 
-#ifdef CONFIG_DECODERS
+#ifdef CONFIG_SONIC_DECODER
 static av_cold int sonic_decode_init(AVCodecContext *avctx)
 {
     SonicContext *s = avctx->priv_data;
@@ -935,7 +935,7 @@ static int sonic_decode_frame(AVCodecContext *avctx,
 
     return (get_bits_count(&gb)+7)/8;
 }
-#endif
+#endif /* CONFIG_SONIC_DECODER */
 
 #ifdef CONFIG_ENCODERS
 AVCodec sonic_encoder = {
@@ -963,7 +963,7 @@ AVCodec sonic_ls_encoder = {
 };
 #endif
 
-#ifdef CONFIG_DECODERS
+#ifdef CONFIG_SONIC_DECODER
 AVCodec sonic_decoder = {
     "sonic",
     CODEC_TYPE_AUDIO,