Commit 679481b3 authored by Diego Biurrun's avatar Diego Biurrun

Drop some pointless #ifdefs.

The files are only compiled if the #ifdef conditions are met.
parent 2130bd8f
...@@ -114,8 +114,6 @@ int ff_tempfile(const char *prefix, char **filename) { ...@@ -114,8 +114,6 @@ int ff_tempfile(const char *prefix, char **filename) {
return fd; /* success */ return fd; /* success */
} }
#if CONFIG_LIBXVID_ENCODER
/** /**
* Create the private context for the encoder. * Create the private context for the encoder.
* All buffers are allocated, settings are loaded from the user, * All buffers are allocated, settings are loaded from the user,
...@@ -830,5 +828,3 @@ AVCodec ff_libxvid_encoder = { ...@@ -830,5 +828,3 @@ AVCodec ff_libxvid_encoder = {
.pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"), .long_name = NULL_IF_CONFIG_SMALL("libxvidcore MPEG-4 part 2"),
}; };
#endif /* CONFIG_LIBXVID_ENCODER */
...@@ -152,7 +152,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i ...@@ -152,7 +152,6 @@ static void dwt_quantize(SnowContext *s, Plane *p, DWTELEM *buffer, int width, i
#endif /* QUANTIZE2==1 */ #endif /* QUANTIZE2==1 */
#if CONFIG_SNOW_ENCODER
static av_cold int encode_init(AVCodecContext *avctx) static av_cold int encode_init(AVCodecContext *avctx)
{ {
SnowContext *s = avctx->priv_data; SnowContext *s = avctx->priv_data;
...@@ -1925,4 +1924,3 @@ AVCodec ff_snow_encoder = { ...@@ -1925,4 +1924,3 @@ AVCodec ff_snow_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("Snow"), .long_name = NULL_IF_CONFIG_SMALL("Snow"),
.priv_class = &snowenc_class, .priv_class = &snowenc_class,
}; };
#endif
...@@ -985,7 +985,6 @@ static int nut_read_close(AVFormatContext *s) ...@@ -985,7 +985,6 @@ static int nut_read_close(AVFormatContext *s)
return 0; return 0;
} }
#if CONFIG_NUT_DEMUXER
AVInputFormat ff_nut_demuxer = { AVInputFormat ff_nut_demuxer = {
.name = "nut", .name = "nut",
.long_name = NULL_IF_CONFIG_SMALL("NUT format"), .long_name = NULL_IF_CONFIG_SMALL("NUT format"),
...@@ -1001,4 +1000,3 @@ AVInputFormat ff_nut_demuxer = { ...@@ -1001,4 +1000,3 @@ AVInputFormat ff_nut_demuxer = {
ff_nut_subtitle_tags, 0 ff_nut_subtitle_tags, 0
}, },
}; };
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment