Drop some pointless #ifdefs.

The files are only compiled if the #ifdef conditions are met.

diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index b003d7e..344f603 100644 (file)
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -114,8 +114,6 @@ int ff_tempfile(const char *prefix, char **filename) {
     return fd; /* success */
 }
 
-#if CONFIG_LIBXVID_ENCODER
-
 /**
  * Create the private context for the encoder.
  * All buffers are allocated, settings are loaded from the user,
@@ -830,5 +828,3 @@ AVCodec ff_libxvid_encoder = {
     .pix_fmts       = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE },
     .long_name      = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
 };
-
-#endif /* CONFIG_LIBXVID_ENCODER */

diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 03d0afc..7b010e1 100644 (file)
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -152,7 +152,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i
 
 #endif /* QUANTIZE2==1 */
 
-#if CONFIG_SNOW_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx)
 {
     SnowContext *s = avctx->priv_data;
@@ -1925,4 +1924,3 @@ AVCodec ff_snow_encoder = {
     .long_name      = NULL_IF_CONFIG_SMALL("Snow"),
     .priv_class     = &snowenc_class,
 };
-#endif

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 32db763..004a2ea 100644 (file)
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -985,7 +985,6 @@ static int nut_read_close(AVFormatContext *s)
     return 0;
 }
 
-#if CONFIG_NUT_DEMUXER
 AVInputFormat ff_nut_demuxer = {
     .name           = "nut",
     .long_name      = NULL_IF_CONFIG_SMALL("NUT format"),
@@ -1001,4 +1000,3 @@ AVInputFormat ff_nut_demuxer = {
         ff_nut_subtitle_tags, 0
     },
 };
-#endif