Merge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976'
authorJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:04:37 +0000 (00:04 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:04:37 +0000 (00:04 -0300)
* commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976':
  ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c

  
  #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
  #include "ac3enc_opts_template.c"
 -static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
 -                                      ac3_options, LIBAVUTIL_VERSION_INT };
 +
 +static const AVClass ac3enc_class = {
 +    .class_name = "Fixed-Point AC-3 Encoder",
 +    .item_name  = av_default_item_name,
 +    .option     = ac3_options,
 +    .version    = LIBAVUTIL_VERSION_INT,
 +};
  
+ static int normalize_samples(AC3EncodeContext *s);
  #include "ac3enc_template.c"
  
  
Simple merge
Simple merge