ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Wed Mar 29 14:34:58 2017 +0200| [35494441b5327d71e7a81896efd610408651c657] | committer: Clément Bœsch
Merge commit '39cea6570c11a49b64b2ec8d71e218db03b4c742' * commit '39cea6570c11a49b64b2ec8d71e218db03b4c742': aactab: Move extern keyword to the front of array declarations Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35494441b5327d71e7a81896efd610408651c657 --- libavcodec/aactab.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index a0d44a2..48ca0fd 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -139,10 +139,10 @@ DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; DECLARE_ALIGNED(32, extern int, ff_aac_kbd_long_1024_fixed)[1024]; DECLARE_ALIGNED(32, extern int, ff_aac_kbd_long_512_fixed)[512]; DECLARE_ALIGNED(32, extern int, ff_aac_kbd_short_128_fixed)[128]; -const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_512)[1920]; -const DECLARE_ALIGNED(32, extern int, ff_aac_eld_window_512_fixed)[1920]; -const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_480)[1800]; -const DECLARE_ALIGNED(32, extern int, ff_aac_eld_window_480_fixed)[1800]; +DECLARE_ALIGNED(32, extern const float, ff_aac_eld_window_512)[1920]; +DECLARE_ALIGNED(32, extern const int, ff_aac_eld_window_512_fixed)[1920]; +DECLARE_ALIGNED(32, extern const float, ff_aac_eld_window_480)[1800]; +DECLARE_ALIGNED(32, extern const int, ff_aac_eld_window_480_fixed)[1800]; // @} /* @name number of scalefactor window bands for long and short transform windows respectively ====================================================================== diff --cc libavcodec/aactab.h index a0d44a2,b1e9510..48ca0fd --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@@ -136,13 -46,8 +136,13 @@@ static const INTFLOAT * const tns_tmp2_ */ DECLARE_ALIGNED(32, extern float, ff_aac_kbd_long_1024)[1024]; DECLARE_ALIGNED(32, extern float, ff_aac_kbd_short_128)[128]; +DECLARE_ALIGNED(32, extern int, ff_aac_kbd_long_1024_fixed)[1024]; +DECLARE_ALIGNED(32, extern int, ff_aac_kbd_long_512_fixed)[512]; +DECLARE_ALIGNED(32, extern int, ff_aac_kbd_short_128_fixed)[128]; - const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_512)[1920]; - const DECLARE_ALIGNED(32, extern int, ff_aac_eld_window_512_fixed)[1920]; - const DECLARE_ALIGNED(32, extern float, ff_aac_eld_window_480)[1800]; - const DECLARE_ALIGNED(32, extern int, ff_aac_eld_window_480_fixed)[1800]; + DECLARE_ALIGNED(32, extern const float, ff_aac_eld_window_512)[1920]; ++DECLARE_ALIGNED(32, extern const int, ff_aac_eld_window_512_fixed)[1920]; + DECLARE_ALIGNED(32, extern const float, ff_aac_eld_window_480)[1800]; ++DECLARE_ALIGNED(32, extern const int, ff_aac_eld_window_480_fixed)[1800]; // @} /* @name number of scalefactor window bands for long and short transform windows respectively _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
