From dca7ba4bffe3e4aeb620cb62955256a0d87561f4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 11 Jun 2014 05:48:30 -0700 Subject: Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs The files are only ever compiled if that condition is true. --- libavcodec/ac3enc_float.c | 4 ---- libavcodec/eac3enc.c | 2 -- 2 files changed, 6 deletions(-) (limited to 'libavcodec') 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 -- cgit v1.2.3