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)
commitc37e8c0b7fd4a68604102eb4c9d9c9f347c57ad2
tree3da89fce5778674f4afbdeeb3f32f28ea0dae7f3
parentbfb2e20737cb310bd352b46a286a73e7a689e0d4
parente22c63ac74b2968075be8bf0d2deb1ee63b28976
Merge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976'

* commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976':
  ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function

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