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/eac3enc.c | |
| parent | 7ed89addb7f6271d17c2ba21ec11204e37fa9917 (diff) | |
| parent | dca7ba4bffe3e4aeb620cb62955256a0d87561f4 (diff) | |
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/eac3enc.c')
| -rw-r--r-- | libavcodec/eac3enc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index 9944617531..951122d80d 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -251,7 +251,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"), @@ -267,4 +266,3 @@ AVCodec ff_eac3_encoder = { .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; -#endif |