diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-06-11 05:48:30 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-12 07:10:18 -0700 |
| commit | dca7ba4bffe3e4aeb620cb62955256a0d87561f4 (patch) | |
| tree | 3d769fca651f0a9aad03a8dbd69e39b2dbbb0bbe | |
| parent | 48e50921337984ba4ec2c1cafe45d43787f84498 (diff) | |
| download | ffmpeg-dca7ba4bffe3e4aeb620cb62955256a0d87561f4.tar.gz | |
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
The files are only ever compiled if that condition is true.
| -rw-r--r-- | libavcodec/ac3enc_float.c | 4 | ||||
| -rw-r--r-- | libavcodec/eac3enc.c | 2 | ||||
| -rw-r--r-- | libavformat/dv.c | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 71db68cbef..03b782c8ad 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -33,12 +33,10 @@ #include "kbdwin.h" -#if CONFIG_AC3_ENCODER #define AC3ENC_TYPE AC3ENC_TYPE_AC3 #include "ac3enc_opts_template.c" static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name, ac3_options, LIBAVUTIL_VERSION_INT }; -#endif #include "ac3enc_template.c" @@ -127,7 +125,6 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl) } -#if CONFIG_AC3_ENCODER AVCodec ff_ac3_encoder = { .name = "ac3", .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), @@ -143,4 +140,3 @@ AVCodec ff_ac3_encoder = { .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; -#endif diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index c238fc133f..18e9f738f5 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -247,7 +247,6 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s) } -#if CONFIG_EAC3_ENCODER AVCodec ff_eac3_encoder = { .name = "eac3", .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), @@ -263,4 +262,3 @@ AVCodec ff_eac3_encoder = { .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; -#endif diff --git a/libavformat/dv.c b/libavformat/dv.c index 2181405ab8..d7d62f1991 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -1,5 +1,5 @@ /* - * General DV muxer/demuxer + * General DV demuxer * Copyright (c) 2003 Roman Shaposhnik * * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth @@ -553,7 +553,6 @@ static int dv_probe(AVProbeData *p) return 0; } -#if CONFIG_DV_DEMUXER AVInputFormat ff_dv_demuxer = { .name = "dv", .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), @@ -565,4 +564,3 @@ AVInputFormat ff_dv_demuxer = { .read_seek = dv_read_seek, .extensions = "dv,dif", }; -#endif |