highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Browse Source 
The files are only ever compiled if that condition is true.
This commit is contained in:
Diego Biurrun 2014-06-11 05:48:30 -07:00
parent 48e5092133
commit dca7ba4bff
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ac3enc_float.c
View File

@ -33,12 +33,10 @@
#include "kbdwin.h" #include "kbdwin.h"
#if CONFIG_AC3_ENCODER
#define AC3ENC_TYPE AC3ENC_TYPE_AC3 #define AC3ENC_TYPE AC3ENC_TYPE_AC3
#include "ac3enc_opts_template.c" #include "ac3enc_opts_template.c"
static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name, static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
ac3_options, LIBAVUTIL_VERSION_INT }; ac3_options, LIBAVUTIL_VERSION_INT };
#endif
#include "ac3enc_template.c" #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 = { AVCodec ff_ac3_encoder = {
.name = "ac3", .name = "ac3",
.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52A (AC-3)"), .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, .channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults, .defaults = ac3_defaults,
}; };
#endif

2
libavcodec/eac3enc.c
View File

@ -247,7 +247,6 @@ void ff_eac3_output_frame_header(AC3EncodeContext *s)
} }
#if CONFIG_EAC3_ENCODER
AVCodec ff_eac3_encoder = { AVCodec ff_eac3_encoder = {
.name = "eac3", .name = "eac3",
.long_name = NULL_IF_CONFIG_SMALL("ATSC A/52 E-AC-3"), .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, .channel_layouts = ff_ac3_channel_layouts,
.defaults = ac3_defaults, .defaults = ac3_defaults,
}; };
#endif

4
libavformat/dv.c
View File

@ -1,5 +1,5 @@
/* /*
* General DV muxer/demuxer * General DV demuxer
* Copyright (c) 2003 Roman Shaposhnik * Copyright (c) 2003 Roman Shaposhnik
* *
* Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth * Many thanks to Dan Dennedy <dan@dennedy.org> for providing wealth
@ -553,7 +553,6 @@ static int dv_probe(AVProbeData *p)
return 0; return 0;
} }
#if CONFIG_DV_DEMUXER
AVInputFormat ff_dv_demuxer = { AVInputFormat ff_dv_demuxer = {
.name = "dv", .name = "dv",
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"), .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@ -565,4 +564,3 @@ AVInputFormat ff_dv_demuxer = {
.read_seek = dv_read_seek, .read_seek = dv_read_seek,
.extensions = "dv,dif", .extensions = "dv,dif",
}; };
#endif