diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-04-10 14:27:59 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-04-10 19:27:38 +0200 |
| commit | 679481b3b61dda5e2827f9757bf8c12a8de193c9 (patch) | |
| tree | c6d1173f0e8fafe25001b790ad66fc82535f8ddf | |
| parent | 2130bd8f5b6504ea14cd41e33f5d4f431eb724f3 (diff) | |
| download | ffmpeg-679481b3b61dda5e2827f9757bf8c12a8de193c9.tar.gz | |
Drop some pointless #ifdefs.
The files are only compiled if the #ifdef conditions are met.
| -rw-r--r-- | libavcodec/libxvidff.c | 4 | ||||
| -rw-r--r-- | libavcodec/snowenc.c | 2 | ||||
| -rw-r--r-- | libavformat/nutdec.c | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c index b003d7e8e3..344f6033ff 100644 --- 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 03d0afcab0..7b010e1f1c 100644 --- 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 32db763a67..004a2ea255 100644 --- 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 |