diff Plugins/Input/aac/libfaad2/kbd_win.h @ 199:0a2ad94e8607 trunk

[svn] Synced with bmp-mp4. Build system is fragile, but should work now.
author chainsaw
date Wed, 16 Nov 2005 16:21:11 -0800
parents fa848bd484d8
children 29feaace84d0
line wrap: on
line diff
--- a/Plugins/Input/aac/libfaad2/kbd_win.h	Wed Nov 16 01:12:05 2005 -0800
+++ b/Plugins/Input/aac/libfaad2/kbd_win.h	Wed Nov 16 16:21:11 2005 -0800
@@ -1,6 +1,6 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
 **  
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: kbd_win.h,v 1.11 2003/11/12 20:47:58 menno Exp $
+** $Id: kbd_win.h,v 1.17 2004/09/04 14:56:28 menno Exp $
 **/
 
 #ifndef __KBD_WIN_H__
@@ -37,7 +37,7 @@
 #pragma warning(disable:4244)
 #endif
 
-real_t kbd_long_1024[] =
+ALIGN static const real_t kbd_long_1024[] =
 {
     FRAC_CONST(0.00029256153896361),
     FRAC_CONST(0.00042998567353047),
@@ -1066,7 +1066,7 @@
 };
 
 #ifdef ALLOW_SMALL_FRAMELENGTH
-real_t kbd_long_960[] = {
+ALIGN static const real_t kbd_long_960[] = {
     FRAC_CONST(0.0003021562530949),
     FRAC_CONST(0.0004452267024786),
     FRAC_CONST(0.0005674947527496),
@@ -2030,7 +2030,7 @@
 };
 #endif
 
-real_t kbd_short_128[] =
+ALIGN static const real_t kbd_short_128[] =
 {
     FRAC_CONST(4.3795702929468881e-005),
     FRAC_CONST(0.00011867384265436617),
@@ -2163,7 +2163,7 @@
 };
 
 #ifdef ALLOW_SMALL_FRAMELENGTH
-real_t kbd_short_120[] =
+ALIGN static const real_t kbd_short_120[] =
 {
     FRAC_CONST(0.0000452320086910),
     FRAC_CONST(0.0001274564692111),