Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 18:25:48 +0000 (20:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Jun 2014 18:25:48 +0000 (20:25 +0200)
* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
libavcodec/ac3enc_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ac3enc_float.c
libavcodec/eac3enc.c
libavformat/dv.c

  #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 };
 +static const AVClass ac3enc_class = {
 +    .class_name = "AC-3 Encoder",
 +    .item_name  = av_default_item_name,
 +    .option     = ac3_options,
 +    .version    = LIBAVUTIL_VERSION_INT,
 +};
- #endif
  
  #include "ac3enc_template.c"
  
Simple merge
Simple merge