diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 20:25:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 20:25:48 +0200 |
| commit | c600c8e966996555724d574e26f9e95259b1f884 (patch) | |
| tree | 46adfa676b96c7676e156f37394fe405cf9cf7b1 /libavcodec/ac3enc_float.c | |
| parent | 7ed89addb7f6271d17c2ba21ec11204e37fa9917 (diff) | |
| parent | dca7ba4bffe3e4aeb620cb62955256a0d87561f4 (diff) | |
| download | ffmpeg-streaming-c600c8e966996555724d574e26f9e95259b1f884.zip ffmpeg-streaming-c600c8e966996555724d574e26f9e95259b1f884.tar.gz | |
Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs
Conflicts:
libavcodec/ac3enc_float.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc_float.c')
| -rw-r--r-- | libavcodec/ac3enc_float.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index 55ea422..85ff663 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -33,7 +33,6 @@ #include "kbdwin.h" -#if CONFIG_AC3_ENCODER #define AC3ENC_TYPE AC3ENC_TYPE_AC3 #include "ac3enc_opts_template.c" static const AVClass ac3enc_class = { @@ -42,7 +41,6 @@ static const AVClass ac3enc_class = { .option = ac3_options, .version = LIBAVUTIL_VERSION_INT, }; -#endif #include "ac3enc_template.c" @@ -137,7 +135,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)"), @@ -153,4 +150,3 @@ AVCodec ff_ac3_encoder = { .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; -#endif |
