[patch] Patch to enable building fdk-aac with GCC6 and no standard switch.

fdk-aac-0.1.4-gcc6.patch (text/plain), 28.32 KB, created by Aric Belsito on 2016-06-13 18:37:21 UTC

diff -Naur fdk-aac-0.1.4.orig/libAACenc/src/aacEnc_rom.cpp fdk-aac-0.1.4/libAACenc/src/aacEnc_rom.cpp
--- fdk-aac-0.1.4.orig/libAACenc/src/aacEnc_rom.cpp	2016-06-12 14:31:40.167999781 -0700
+++ fdk-aac-0.1.4/libAACenc/src/aacEnc_rom.cpp	2016-06-13 11:10:12.491602816 -0700
@@ -657,11 +657,11 @@
 */
 const FIXP_DBL FDKaacEnc_tnsEncCoeff3[8]=
 {
-  0x81f1d201, 0x91261481, 0xadb92301, 0xd438af00, 0x00000000, 0x37898080, 0x64130dff, 0x7cca6fff
+  (FIXP_DBL) 0x81f1d201, (FIXP_DBL) 0x91261481, (FIXP_DBL) 0xadb92301, (FIXP_DBL) 0xd438af00, (FIXP_DBL) 0x00000000, (FIXP_DBL) 0x37898080, (FIXP_DBL) 0x64130dff, (FIXP_DBL) 0x7cca6fff
 };
 const FIXP_DBL FDKaacEnc_tnsCoeff3Borders[8]={
-  0x80000001 /*-4*/,  0x87b826df /*-3*/,  0x9df24154 /*-2*/,  0xbfffffe5 /*-1*/,
-  0xe9c5e578 /* 0*/,  0x1c7b90f0 /* 1*/,  0x4fce83a9 /* 2*/,  0x7352f2c3 /* 3*/
+  (FIXP_DBL) 0x80000001 /*-4*/, (FIXP_DBL) 0x87b826df /*-3*/, (FIXP_DBL) 0x9df24154 /*-2*/, (FIXP_DBL) 0xbfffffe5 /*-1*/,
+  (FIXP_DBL) 0xe9c5e578 /* 0*/, (FIXP_DBL) 0x1c7b90f0 /* 1*/, (FIXP_DBL) 0x4fce83a9 /* 2*/, (FIXP_DBL) 0x7352f2c3 /* 3*/
 };
 
 /*
@@ -669,15 +669,15 @@
 */
 const FIXP_DBL FDKaacEnc_tnsEncCoeff4[16]=
 {
-  0x808bc881, 0x84e2e581, 0x8d6b4a01, 0x99da9201, 0xa9c45701, 0xbc9dde81, 0xd1c2d500, 0xe87ae540,
-  0x00000000, 0x1a9cd9c0, 0x340ff240, 0x4b3c8bff, 0x5f1f5e7f, 0x6ed9eb7f, 0x79bc387f, 0x7f4c7e7f
+  (FIXP_DBL) 0x808bc881, (FIXP_DBL) 0x84e2e581, (FIXP_DBL) 0x8d6b4a01, (FIXP_DBL) 0x99da9201, (FIXP_DBL) 0xa9c45701, (FIXP_DBL) 0xbc9dde81, (FIXP_DBL) 0xd1c2d500, (FIXP_DBL) 0xe87ae540,
+  (FIXP_DBL) 0x00000000, (FIXP_DBL) 0x1a9cd9c0, (FIXP_DBL) 0x340ff240, (FIXP_DBL) 0x4b3c8bff, (FIXP_DBL) 0x5f1f5e7f, (FIXP_DBL) 0x6ed9eb7f, (FIXP_DBL) 0x79bc387f, (FIXP_DBL) 0x7f4c7e7f
 };
 const FIXP_DBL FDKaacEnc_tnsCoeff4Borders[16]=
 {
-  0x80000001 /*-8*/,  0x822deff0 /*-7*/,  0x88a4bfe6 /*-6*/,  0x932c159d /*-5*/,
-  0xa16827c2 /*-4*/,  0xb2dcde27 /*-3*/,  0xc6f20b91 /*-2*/,  0xdcf89c64 /*-1*/,
-  0xf4308ce1 /* 0*/,  0x0d613054 /* 1*/,  0x278dde80 /* 2*/,  0x4000001b /* 3*/,
-  0x55a6127b /* 4*/,  0x678dde8f /* 5*/,  0x74ef0ed7 /* 6*/,  0x7d33f0da /* 7*/
+  (FIXP_DBL) 0x80000001 /*-8*/, (FIXP_DBL) 0x822deff0 /*-7*/, (FIXP_DBL) 0x88a4bfe6 /*-6*/, (FIXP_DBL) 0x932c159d /*-5*/,
+  (FIXP_DBL) 0xa16827c2 /*-4*/, (FIXP_DBL) 0xb2dcde27 /*-3*/, (FIXP_DBL) 0xc6f20b91 /*-2*/, (FIXP_DBL) 0xdcf89c64 /*-1*/,
+  (FIXP_DBL) 0xf4308ce1 /* 0*/, (FIXP_DBL) 0x0d613054 /* 1*/, (FIXP_DBL) 0x278dde80 /* 2*/, (FIXP_DBL) 0x4000001b /* 3*/,
+  (FIXP_DBL) 0x55a6127b /* 4*/, (FIXP_DBL) 0x678dde8f /* 5*/, (FIXP_DBL) 0x74ef0ed7 /* 6*/, (FIXP_DBL) 0x7d33f0da /* 7*/
 };
 const FIXP_DBL FDKaacEnc_mTab_4_3Elc[512]={
   FL2FXCONST_DBL(0.3968502629920499),FL2FXCONST_DBL(0.3978840634868335),FL2FXCONST_DBL(0.3989185359354711),FL2FXCONST_DBL(0.3999536794661432),
diff -Naur fdk-aac-0.1.4.orig/libAACenc/src/adj_thr.cpp fdk-aac-0.1.4/libAACenc/src/adj_thr.cpp
--- fdk-aac-0.1.4.orig/libAACenc/src/adj_thr.cpp	2016-06-12 14:31:40.167999781 -0700
+++ fdk-aac-0.1.4/libAACenc/src/adj_thr.cpp	2016-06-13 11:34:30.610632225 -0700
@@ -149,78 +149,78 @@
 } BITS2PE_CFG_TAB;
 
 static const BIT_PE_SFAC S_Bits2PeTab16000[] = {
-  { 10000, 0x228F5C29, 0x02FEF55D, 0x1D70A3D7, 0x09BC9D6D, 0x228F5C29, 0x02FEF55D, 0x1C28F5C3, 0x0CBB92CA},
-  { 24000, 0x23D70A3D, 0x029F16B1, 0x2199999A, 0x07DD4413, 0x23D70A3D, 0x029F16B1, 0x2199999A, 0x07DD4413},
-  { 32000, 0x247AE148, 0x11B1D92B, 0x23851EB8, 0x01F75105, 0x247AE148, 0x110A137F, 0x23851EB8, 0x01F75105},
-  { 48000, 0x2D1EB852, 0x6833C600, 0x247AE148, 0x014F8B59, 0x2CCCCCCD, 0x68DB8BAC, 0x247AE148, 0x01F75105},
-  { 64000, 0x60000000, 0x00000000, 0x251EB852, 0x154C985F, 0x60000000, 0x00000000, 0x2570A3D7, 0x154C985F},
-  { 96000, 0x60000000, 0x00000000, 0x39EB851F, 0x088509C0, 0x60000000, 0x00000000, 0x3A3D70A4, 0x088509C0},
-  {128000, 0x60000000, 0x00000000, 0x423D70A4, 0x18A43BB4, 0x60000000, 0x00000000, 0x428F5C29, 0x181E03F7},
-  {148000, 0x60000000, 0x00000000, 0x5147AE14, 0x00000000, 0x60000000, 0x00000000, 0x5147AE14, 0x00000000}
+  { 10000, (LONG) 0x228F5C29, (LONG) 0x02FEF55D, (LONG) 0x1D70A3D7, (LONG) 0x09BC9D6D, (LONG) 0x228F5C29, (LONG) 0x02FEF55D, (LONG) 0x1C28F5C3, (LONG) 0x0CBB92CA},
+  { 24000, (LONG) 0x23D70A3D, (LONG) 0x029F16B1, (LONG) 0x2199999A, (LONG) 0x07DD4413, (LONG) 0x23D70A3D, (LONG) 0x029F16B1, (LONG) 0x2199999A, (LONG) 0x07DD4413},
+  { 32000, (LONG) 0x247AE148, (LONG) 0x11B1D92B, (LONG) 0x23851EB8, (LONG) 0x01F75105, (LONG) 0x247AE148, (LONG) 0x110A137F, (LONG) 0x23851EB8, (LONG) 0x01F75105},
+  { 48000, (LONG) 0x2D1EB852, (LONG) 0x6833C600, (LONG) 0x247AE148, (LONG) 0x014F8B59, (LONG) 0x2CCCCCCD, (LONG) 0x68DB8BAC, (LONG) 0x247AE148, (LONG) 0x01F75105},
+  { 64000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x251EB852, (LONG) 0x154C985F, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x2570A3D7, (LONG) 0x154C985F},
+  { 96000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x39EB851F, (LONG) 0x088509C0, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x3A3D70A4, (LONG) 0x088509C0},
+  {128000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x423D70A4, (LONG) 0x18A43BB4, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x428F5C29, (LONG) 0x181E03F7},
+  {148000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x5147AE14, (LONG) 0x00000000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x5147AE14, (LONG) 0x00000000}
 };
 
 static const BIT_PE_SFAC S_Bits2PeTab22050[] = {
-  { 16000, 0x1a8f5c29, 0x1797cc3a, 0x128f5c29, 0x18e75793, 0x175c28f6, 0x221426fe, 0x00000000, 0x5a708ede},
-  { 24000, 0x2051eb85, 0x092ccf6c, 0x18a3d70a, 0x13a92a30, 0x1fae147b, 0xbcbe61d,  0x16147ae1, 0x18e75793},
-  { 32000, 0x228f5c29, 0x029f16b1, 0x1d70a3d7, 0x088509c0, 0x228f5c29, 0x29f16b1,  0x1c28f5c3, 0x0b242071},
-  { 48000, 0x23d70a3d, 0x014f8b59, 0x2199999a, 0x03eea20a, 0x23d70a3d, 0x14f8b59,  0x2199999a, 0x03eea20a},
-  { 64000, 0x247ae148, 0x08d8ec96, 0x23851eb8, 0x00fba882, 0x247ae148, 0x88509c0,  0x23851eb8, 0x00fba882},
-  { 96000, 0x2d1eb852, 0x3419e300, 0x247ae148, 0x00a7c5ac, 0x2ccccccd, 0x346dc5d6, 0x247ae148, 0x00fba882},
-  {128000, 0x60000000, 0x00000000, 0x251eb852, 0x029f16b1, 0x60000000, 0x00000000, 0x2570a3d7, 0x009f16b1},
-  {148000, 0x60000000, 0x00000000, 0x26b851ec, 0x00000000, 0x60000000, 0x00000000, 0x270a3d71, 0x00000000}
+  { 16000, (LONG) 0x1a8f5c29, (LONG) 0x1797cc3a, (LONG) 0x128f5c29, (LONG) 0x18e75793, (LONG) 0x175c28f6, (LONG) 0x221426fe, (LONG) 0x00000000, (LONG) 0x5a708ede},
+  { 24000, (LONG) 0x2051eb85, (LONG) 0x092ccf6c, (LONG) 0x18a3d70a, (LONG) 0x13a92a30, (LONG) 0x1fae147b, (LONG) 0xbcbe61d,  (LONG) 0x16147ae1, (LONG) 0x18e75793},
+  { 32000, (LONG) 0x228f5c29, (LONG) 0x029f16b1, (LONG) 0x1d70a3d7, (LONG) 0x088509c0, (LONG) 0x228f5c29, (LONG) 0x29f16b1,  (LONG) 0x1c28f5c3, (LONG) 0x0b242071},
+  { 48000, (LONG) 0x23d70a3d, (LONG) 0x014f8b59, (LONG) 0x2199999a, (LONG) 0x03eea20a, (LONG) 0x23d70a3d, (LONG) 0x14f8b59,  (LONG) 0x2199999a, (LONG) 0x03eea20a},
+  { 64000, (LONG) 0x247ae148, (LONG) 0x08d8ec96, (LONG) 0x23851eb8, (LONG) 0x00fba882, (LONG) 0x247ae148, (LONG) 0x88509c0,  (LONG) 0x23851eb8, (LONG) 0x00fba882},
+  { 96000, (LONG) 0x2d1eb852, (LONG) 0x3419e300, (LONG) 0x247ae148, (LONG) 0x00a7c5ac, (LONG) 0x2ccccccd, (LONG) 0x346dc5d6, (LONG) 0x247ae148, (LONG) 0x00fba882},
+  {128000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x251eb852, (LONG) 0x029f16b1, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x2570a3d7, (LONG) 0x009f16b1},
+  {148000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x26b851ec, (LONG) 0x00000000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x270a3d71, (LONG) 0x00000000}
 };
 
 static const BIT_PE_SFAC S_Bits2PeTab24000[] = {
-  { 16000, 0x19eb851f, 0x13a92a30, 0x1147ae14, 0x164840e1, 0x1999999a, 0x12599ed8, 0x00000000, 0x46c764ae},
-  { 24000, 0x1eb851ec, 0x0d1b7176, 0x16b851ec, 0x18e75793, 0x1e147ae1, 0x0fba8827, 0x1147ae14, 0x2c9081c3},
-  { 32000, 0x21eb851f, 0x049667b6, 0x1ccccccd, 0x07357e67, 0x21eb851f, 0x03eea20a, 0x1c28f5c3, 0x07357e67},
-  { 48000, 0x2428f5c3, 0x014f8b59, 0x2051eb85, 0x053e2d62, 0x23d70a3d, 0x01f75105, 0x1fae147b, 0x07357e67},
-  { 64000, 0x24cccccd, 0x05e5f30e, 0x22e147ae, 0x01a36e2f, 0x24cccccd, 0x05e5f30e, 0x23333333, 0x014f8b59},
-  { 96000, 0x2a8f5c29, 0x24b33db0, 0x247ae148, 0x00fba882, 0x2a8f5c29, 0x26fe718b, 0x247ae148, 0x00fba882},
-  {128000, 0x4e666666, 0x1cd5f99c, 0x2570a3d7, 0x010c6f7a, 0x50a3d70a, 0x192a7371, 0x2570a3d7, 0x010c6f7a},
-  {148000, 0x60000000, 0x00000000, 0x26147ae1, 0x00000000, 0x60000000, 0x00000000, 0x26147ae1, 0x00000000}
+  { 16000, (LONG) 0x19eb851f, (LONG) 0x13a92a30, (LONG) 0x1147ae14, (LONG) 0x164840e1, (LONG) 0x1999999a, (LONG) 0x12599ed8, (LONG) 0x00000000, (LONG) 0x46c764ae},
+  { 24000, (LONG) 0x1eb851ec, (LONG) 0x0d1b7176, (LONG) 0x16b851ec, (LONG) 0x18e75793, (LONG) 0x1e147ae1, (LONG) 0x0fba8827, (LONG) 0x1147ae14, (LONG) 0x2c9081c3},
+  { 32000, (LONG) 0x21eb851f, (LONG) 0x049667b6, (LONG) 0x1ccccccd, (LONG) 0x07357e67, (LONG) 0x21eb851f, (LONG) 0x03eea20a, (LONG) 0x1c28f5c3, (LONG) 0x07357e67},
+  { 48000, (LONG) 0x2428f5c3, (LONG) 0x014f8b59, (LONG) 0x2051eb85, (LONG) 0x053e2d62, (LONG) 0x23d70a3d, (LONG) 0x01f75105, (LONG) 0x1fae147b, (LONG) 0x07357e67},
+  { 64000, (LONG) 0x24cccccd, (LONG) 0x05e5f30e, (LONG) 0x22e147ae, (LONG) 0x01a36e2f, (LONG) 0x24cccccd, (LONG) 0x05e5f30e, (LONG) 0x23333333, (LONG) 0x014f8b59},
+  { 96000, (LONG) 0x2a8f5c29, (LONG) 0x24b33db0, (LONG) 0x247ae148, (LONG) 0x00fba882, (LONG) 0x2a8f5c29, (LONG) 0x26fe718b, (LONG) 0x247ae148, (LONG) 0x00fba882},
+  {128000, (LONG) 0x4e666666, (LONG) 0x1cd5f99c, (LONG) 0x2570a3d7, (LONG) 0x010c6f7a, (LONG) 0x50a3d70a, (LONG) 0x192a7371, (LONG) 0x2570a3d7, (LONG) 0x010c6f7a},
+  {148000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x26147ae1, (LONG) 0x00000000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x26147ae1, (LONG) 0x00000000}
 };
 
 static const BIT_PE_SFAC S_Bits2PeTab32000[] = {
-  { 16000, 0x1199999a, 0x20c49ba6, 0x00000000, 0x4577d955, 0x00000000, 0x60fe4799, 0x00000000, 0x00000000},
-  { 24000, 0x1999999a, 0x0fba8827, 0x10f5c28f, 0x1b866e44, 0x17ae147b, 0x0fba8827, 0x00000000, 0x4d551d69},
-  { 32000, 0x1d70a3d7, 0x07357e67, 0x17ae147b, 0x09d49518, 0x1b851eb8, 0x0a7c5ac4, 0x12e147ae, 0x110a137f},
-  { 48000, 0x20f5c28f, 0x049667b6, 0x1c7ae148, 0x053e2d62, 0x20a3d70a, 0x053e2d62, 0x1b333333, 0x05e5f30e},
-  { 64000, 0x23333333, 0x029f16b1, 0x1f0a3d71, 0x02f2f987, 0x23333333, 0x029f16b1, 0x1e147ae1, 0x03eea20a},
-  { 96000, 0x25c28f5c, 0x2c3c9eed, 0x21eb851f, 0x01f75105, 0x25c28f5c, 0x0a7c5ac4, 0x21eb851f, 0x01a36e2f},
-  {128000, 0x50f5c28f, 0x18a43bb4, 0x23d70a3d, 0x010c6f7a, 0x30000000, 0x168b5cc0, 0x23851eb8, 0x0192a737},
-  {148000, 0x60000000, 0x00000000, 0x247ae148, 0x00dfb23b, 0x3dc28f5c, 0x300f4aaf, 0x247ae148, 0x01bf6476},
-  {160000, 0x60000000, 0xb15b5740, 0x24cccccd, 0x053e2d62, 0x4f5c28f6, 0xbefd0072, 0x251eb852, 0x04fb1184},
-  {200000, 0x00000000, 0x00000000, 0x2b333333, 0x0836be91, 0x00000000, 0x00000000, 0x2b333333, 0x0890390f},
-  {320000, 0x00000000, 0x00000000, 0x4947ae14, 0x00000000, 0x00000000, 0x00000000, 0x4a8f5c29, 0x00000000}
+  { 16000, (LONG) 0x1199999a, (LONG) 0x20c49ba6, (LONG) 0x00000000, (LONG) 0x4577d955, (LONG) 0x00000000, (LONG) 0x60fe4799, (LONG) 0x00000000, (LONG) 0x00000000},
+  { 24000, (LONG) 0x1999999a, (LONG) 0x0fba8827, (LONG) 0x10f5c28f, (LONG) 0x1b866e44, (LONG) 0x17ae147b, (LONG) 0x0fba8827, (LONG) 0x00000000, (LONG) 0x4d551d69},
+  { 32000, (LONG) 0x1d70a3d7, (LONG) 0x07357e67, (LONG) 0x17ae147b, (LONG) 0x09d49518, (LONG) 0x1b851eb8, (LONG) 0x0a7c5ac4, (LONG) 0x12e147ae, (LONG) 0x110a137f},
+  { 48000, (LONG) 0x20f5c28f, (LONG) 0x049667b6, (LONG) 0x1c7ae148, (LONG) 0x053e2d62, (LONG) 0x20a3d70a, (LONG) 0x053e2d62, (LONG) 0x1b333333, (LONG) 0x05e5f30e},
+  { 64000, (LONG) 0x23333333, (LONG) 0x029f16b1, (LONG) 0x1f0a3d71, (LONG) 0x02f2f987, (LONG) 0x23333333, (LONG) 0x029f16b1, (LONG) 0x1e147ae1, (LONG) 0x03eea20a},
+  { 96000, (LONG) 0x25c28f5c, (LONG) 0x2c3c9eed, (LONG) 0x21eb851f, (LONG) 0x01f75105, (LONG) 0x25c28f5c, (LONG) 0x0a7c5ac4, (LONG) 0x21eb851f, (LONG) 0x01a36e2f},
+  {128000, (LONG) 0x50f5c28f, (LONG) 0x18a43bb4, (LONG) 0x23d70a3d, (LONG) 0x010c6f7a, (LONG) 0x30000000, (LONG) 0x168b5cc0, (LONG) 0x23851eb8, (LONG) 0x0192a737},
+  {148000, (LONG) 0x60000000, (LONG) 0x00000000, (LONG) 0x247ae148, (LONG) 0x00dfb23b, (LONG) 0x3dc28f5c, (LONG) 0x300f4aaf, (LONG) 0x247ae148, (LONG) 0x01bf6476},
+  {160000, (LONG) 0x60000000, (LONG) 0xb15b5740, (LONG) 0x24cccccd, (LONG) 0x053e2d62, (LONG) 0x4f5c28f6, (LONG) 0xbefd0072, (LONG) 0x251eb852, (LONG) 0x04fb1184},
+  {200000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x2b333333, (LONG) 0x0836be91, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x2b333333, (LONG) 0x0890390f},
+  {320000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x4947ae14, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x4a8f5c29, (LONG) 0x00000000}
 };
 
 static const BIT_PE_SFAC S_Bits2PeTab44100[] = {
-  { 16000, 0x10a3d70a, 0x1797cc3a, 0x00000000, 0x00000000, 0x00000000, 0x59210386, 0x00000000, 0x00000000},
-  { 24000, 0x16666666, 0x1797cc3a, 0x00000000, 0x639d5e4a, 0x15c28f5c, 0x12599ed8, 0x00000000, 0x5bc01a37},
-  { 32000, 0x1c28f5c3, 0x049667b6, 0x1851eb85, 0x049667b6, 0x1a3d70a4, 0x088509c0, 0x16666666, 0x053e2d62},
-  { 48000, 0x1e666666, 0x05e5f30e, 0x1a8f5c29, 0x049667b6, 0x1e666666, 0x05e5f30e, 0x18f5c28f, 0x05e5f30e},
-  { 64000, 0x2147ae14, 0x0346dc5d, 0x1ccccccd, 0x02f2f987, 0x2147ae14, 0x02f2f987, 0x1bd70a3d, 0x039abf34},
-  { 96000, 0x247ae148, 0x068db8bb, 0x1fae147b, 0x029f16b1, 0x2428f5c3, 0x0639d5e5, 0x1f5c28f6, 0x029f16b1},
-  {128000, 0x2ae147ae, 0x1b435265, 0x223d70a4, 0x0192a737, 0x2a3d70a4, 0x1040bfe4, 0x21eb851f, 0x0192a737},
-  {148000, 0x3b851eb8, 0x2832069c, 0x23333333, 0x00dfb23b, 0x3428f5c3, 0x2054c288, 0x22e147ae, 0x00dfb23b},
-  {160000, 0x4a3d70a4, 0xc32ebe5a, 0x23851eb8, 0x01d5c316, 0x40000000, 0xcb923a2b, 0x23333333, 0x01d5c316},
-  {200000, 0x00000000, 0x00000000, 0x25c28f5c, 0x0713f078, 0x00000000, 0x00000000, 0x2570a3d7, 0x072a4f17},
-  {320000, 0x00000000, 0x00000000, 0x3fae147b, 0x00000000, 0x00000000, 0x00000000, 0x3fae147b, 0x00000000}
+  { 16000, (LONG) 0x10a3d70a, (LONG) 0x1797cc3a, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x59210386, (LONG) 0x00000000, (LONG) 0x00000000},
+  { 24000, (LONG) 0x16666666, (LONG) 0x1797cc3a, (LONG) 0x00000000, (LONG) 0x639d5e4a, (LONG) 0x15c28f5c, (LONG) 0x12599ed8, (LONG) 0x00000000, (LONG) 0x5bc01a37},
+  { 32000, (LONG) 0x1c28f5c3, (LONG) 0x049667b6, (LONG) 0x1851eb85, (LONG) 0x049667b6, (LONG) 0x1a3d70a4, (LONG) 0x088509c0, (LONG) 0x16666666, (LONG) 0x053e2d62},
+  { 48000, (LONG) 0x1e666666, (LONG) 0x05e5f30e, (LONG) 0x1a8f5c29, (LONG) 0x049667b6, (LONG) 0x1e666666, (LONG) 0x05e5f30e, (LONG) 0x18f5c28f, (LONG) 0x05e5f30e},
+  { 64000, (LONG) 0x2147ae14, (LONG) 0x0346dc5d, (LONG) 0x1ccccccd, (LONG) 0x02f2f987, (LONG) 0x2147ae14, (LONG) 0x02f2f987, (LONG) 0x1bd70a3d, (LONG) 0x039abf34},
+  { 96000, (LONG) 0x247ae148, (LONG) 0x068db8bb, (LONG) 0x1fae147b, (LONG) 0x029f16b1, (LONG) 0x2428f5c3, (LONG) 0x0639d5e5, (LONG) 0x1f5c28f6, (LONG) 0x029f16b1},
+  {128000, (LONG) 0x2ae147ae, (LONG) 0x1b435265, (LONG) 0x223d70a4, (LONG) 0x0192a737, (LONG) 0x2a3d70a4, (LONG) 0x1040bfe4, (LONG) 0x21eb851f, (LONG) 0x0192a737},
+  {148000, (LONG) 0x3b851eb8, (LONG) 0x2832069c, (LONG) 0x23333333, (LONG) 0x00dfb23b, (LONG) 0x3428f5c3, (LONG) 0x2054c288, (LONG) 0x22e147ae, (LONG) 0x00dfb23b},
+  {160000, (LONG) 0x4a3d70a4, (LONG) 0xc32ebe5a, (LONG) 0x23851eb8, (LONG) 0x01d5c316, (LONG) 0x40000000, (LONG) 0xcb923a2b, (LONG) 0x23333333, (LONG) 0x01d5c316},
+  {200000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x25c28f5c, (LONG) 0x0713f078, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x2570a3d7, (LONG) 0x072a4f17},
+  {320000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x3fae147b, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x3fae147b, (LONG) 0x00000000}
 };
 
 static const BIT_PE_SFAC S_Bits2PeTab48000[] = {
-  { 16000, 0x0f5c28f6, 0x31ceaf25, 0x00000000, 0x00000000, 0x00000000, 0x74a771c9, 0x00000000, 0x00000000},
-  { 24000, 0x1b851eb8, 0x029f16b1, 0x00000000, 0x663c74fb, 0x1c7ae148, 0xe47991bd, 0x00000000, 0x49667b5f},
-  { 32000, 0x1c28f5c3, 0x029f16b1, 0x18f5c28f, 0x07357e67, 0x15c28f5c, 0x0f12c27a, 0x11eb851f, 0x13016484},
-  { 48000, 0x1d70a3d7, 0x053e2d62, 0x1c7ae148, 0xfe08aefc, 0x1d1eb852, 0x068db8bb, 0x1b333333, 0xfeb074a8},
-  { 64000, 0x20000000, 0x03eea20a, 0x1b851eb8, 0x0346dc5d, 0x2051eb85, 0x0346dc5d, 0x1a8f5c29, 0x039abf34},
-  { 96000, 0x23d70a3d, 0x053e2d62, 0x1eb851ec, 0x029f16b1, 0x23851eb8, 0x04ea4a8c, 0x1e147ae1, 0x02f2f987},
-  {128000, 0x28f5c28f, 0x14727dcc, 0x2147ae14, 0x0218def4, 0x2851eb85, 0x0e27e0f0, 0x20f5c28f, 0x0218def4},
-  {148000, 0x3570a3d7, 0x1cd5f99c, 0x228f5c29, 0x01bf6476, 0x30f5c28f, 0x18777e75, 0x223d70a4, 0x01bf6476},
-  {160000, 0x40000000, 0xcb923a2b, 0x23333333, 0x0192a737, 0x39eb851f, 0xd08d4bae, 0x22e147ae, 0x0192a737},
-  {200000, 0x00000000, 0x00000000, 0x251eb852, 0x06775a1b, 0x00000000, 0x00000000, 0x24cccccd, 0x06a4175a},
-  {320000, 0x00000000, 0x00000000, 0x3ccccccd, 0x00000000, 0x00000000, 0x00000000, 0x3d1eb852, 0x00000000}
+  { 16000, (LONG) 0x0f5c28f6, (LONG) 0x31ceaf25, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x74a771c9, (LONG) 0x00000000, (LONG) 0x00000000},
+  { 24000, (LONG) 0x1b851eb8, (LONG) 0x029f16b1, (LONG) 0x00000000, (LONG) 0x663c74fb, (LONG) 0x1c7ae148, (LONG) 0xe47991bd, (LONG) 0x00000000, (LONG) 0x49667b5f},
+  { 32000, (LONG) 0x1c28f5c3, (LONG) 0x029f16b1, (LONG) 0x18f5c28f, (LONG) 0x07357e67, (LONG) 0x15c28f5c, (LONG) 0x0f12c27a, (LONG) 0x11eb851f, (LONG) 0x13016484},
+  { 48000, (LONG) 0x1d70a3d7, (LONG) 0x053e2d62, (LONG) 0x1c7ae148, (LONG) 0xfe08aefc, (LONG) 0x1d1eb852, (LONG) 0x068db8bb, (LONG) 0x1b333333, (LONG) 0xfeb074a8},
+  { 64000, (LONG) 0x20000000, (LONG) 0x03eea20a, (LONG) 0x1b851eb8, (LONG) 0x0346dc5d, (LONG) 0x2051eb85, (LONG) 0x0346dc5d, (LONG) 0x1a8f5c29, (LONG) 0x039abf34},
+  { 96000, (LONG) 0x23d70a3d, (LONG) 0x053e2d62, (LONG) 0x1eb851ec, (LONG) 0x029f16b1, (LONG) 0x23851eb8, (LONG) 0x04ea4a8c, (LONG) 0x1e147ae1, (LONG) 0x02f2f987},
+  {128000, (LONG) 0x28f5c28f, (LONG) 0x14727dcc, (LONG) 0x2147ae14, (LONG) 0x0218def4, (LONG) 0x2851eb85, (LONG) 0x0e27e0f0, (LONG) 0x20f5c28f, (LONG) 0x0218def4},
+  {148000, (LONG) 0x3570a3d7, (LONG) 0x1cd5f99c, (LONG) 0x228f5c29, (LONG) 0x01bf6476, (LONG) 0x30f5c28f, (LONG) 0x18777e75, (LONG) 0x223d70a4, (LONG) 0x01bf6476},
+  {160000, (LONG) 0x40000000, (LONG) 0xcb923a2b, (LONG) 0x23333333, (LONG) 0x0192a737, (LONG) 0x39eb851f, (LONG) 0xd08d4bae, (LONG) 0x22e147ae, (LONG) 0x0192a737},
+  {200000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x251eb852, (LONG) 0x06775a1b, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x24cccccd, (LONG) 0x06a4175a},
+  {320000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x3ccccccd, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x00000000, (LONG) 0x3d1eb852, (LONG) 0x00000000}
 };
 
 static const BITS2PE_CFG_TAB bits2PeConfigTab[] = {
diff -Naur fdk-aac-0.1.4.orig/libFDK/src/fixpoint_math.cpp fdk-aac-0.1.4/libFDK/src/fixpoint_math.cpp
--- fdk-aac-0.1.4.orig/libFDK/src/fixpoint_math.cpp	2016-06-12 14:31:40.202000073 -0700
+++ fdk-aac-0.1.4/libFDK/src/fixpoint_math.cpp	2016-06-13 11:29:49.072860476 -0700
@@ -322,31 +322,31 @@
 
     LNK_SECTION_CONSTDATA_L1
     static const FIXP_DBL ldIntCoeff[] = {
-      0x80000001, 0x00000000, 0x02000000, 0x032b8034, 0x04000000, 0x04a4d3c2, 0x052b8034, 0x059d5da0,
-      0x06000000, 0x06570069, 0x06a4d3c2, 0x06eb3a9f, 0x072b8034, 0x0766a009, 0x079d5da0, 0x07d053f7,
-      0x08000000, 0x082cc7ee, 0x08570069, 0x087ef05b, 0x08a4d3c2, 0x08c8ddd4, 0x08eb3a9f, 0x090c1050,
-      0x092b8034, 0x0949a785, 0x0966a009, 0x0982809d, 0x099d5da0, 0x09b74949, 0x09d053f7, 0x09e88c6b,
-      0x0a000000, 0x0a16bad3, 0x0a2cc7ee, 0x0a423162, 0x0a570069, 0x0a6b3d79, 0x0a7ef05b, 0x0a92203d,
-      0x0aa4d3c2, 0x0ab7110e, 0x0ac8ddd4, 0x0ada3f60, 0x0aeb3a9f, 0x0afbd42b, 0x0b0c1050, 0x0b1bf312,
-      0x0b2b8034, 0x0b3abb40, 0x0b49a785, 0x0b584822, 0x0b66a009, 0x0b74b1fd, 0x0b82809d, 0x0b900e61,
-      0x0b9d5da0, 0x0baa708f, 0x0bb74949, 0x0bc3e9ca, 0x0bd053f7, 0x0bdc899b, 0x0be88c6b, 0x0bf45e09,
-      0x0c000000, 0x0c0b73cb, 0x0c16bad3, 0x0c21d671, 0x0c2cc7ee, 0x0c379085, 0x0c423162, 0x0c4caba8,
-      0x0c570069, 0x0c6130af, 0x0c6b3d79, 0x0c7527b9, 0x0c7ef05b, 0x0c88983f, 0x0c92203d, 0x0c9b8926,
-      0x0ca4d3c2, 0x0cae00d2, 0x0cb7110e, 0x0cc0052b, 0x0cc8ddd4, 0x0cd19bb0, 0x0cda3f60, 0x0ce2c97d,
-      0x0ceb3a9f, 0x0cf39355, 0x0cfbd42b, 0x0d03fda9, 0x0d0c1050, 0x0d140ca0, 0x0d1bf312, 0x0d23c41d,
-      0x0d2b8034, 0x0d3327c7, 0x0d3abb40, 0x0d423b08, 0x0d49a785, 0x0d510118, 0x0d584822, 0x0d5f7cff,
-      0x0d66a009, 0x0d6db197, 0x0d74b1fd, 0x0d7ba190, 0x0d82809d, 0x0d894f75, 0x0d900e61, 0x0d96bdad,
-      0x0d9d5da0, 0x0da3ee7f, 0x0daa708f, 0x0db0e412, 0x0db74949, 0x0dbda072, 0x0dc3e9ca, 0x0dca258e,
-      0x0dd053f7, 0x0dd6753e, 0x0ddc899b, 0x0de29143, 0x0de88c6b, 0x0dee7b47, 0x0df45e09, 0x0dfa34e1,
-      0x0e000000, 0x0e05bf94, 0x0e0b73cb, 0x0e111cd2, 0x0e16bad3, 0x0e1c4dfb, 0x0e21d671, 0x0e275460,
-      0x0e2cc7ee, 0x0e323143, 0x0e379085, 0x0e3ce5d8, 0x0e423162, 0x0e477346, 0x0e4caba8, 0x0e51daa8,
-      0x0e570069, 0x0e5c1d0b, 0x0e6130af, 0x0e663b74, 0x0e6b3d79, 0x0e7036db, 0x0e7527b9, 0x0e7a1030,
-      0x0e7ef05b, 0x0e83c857, 0x0e88983f, 0x0e8d602e, 0x0e92203d, 0x0e96d888, 0x0e9b8926, 0x0ea03232,
-      0x0ea4d3c2, 0x0ea96df0, 0x0eae00d2, 0x0eb28c7f, 0x0eb7110e, 0x0ebb8e96, 0x0ec0052b, 0x0ec474e4,
-      0x0ec8ddd4, 0x0ecd4012, 0x0ed19bb0, 0x0ed5f0c4, 0x0eda3f60, 0x0ede8797, 0x0ee2c97d, 0x0ee70525,
-      0x0eeb3a9f, 0x0eef69ff, 0x0ef39355, 0x0ef7b6b4, 0x0efbd42b, 0x0effebcd, 0x0f03fda9, 0x0f0809cf,
-      0x0f0c1050, 0x0f10113b, 0x0f140ca0, 0x0f18028d, 0x0f1bf312, 0x0f1fde3d, 0x0f23c41d, 0x0f27a4c0,
-      0x0f2b8034
+      (FIXP_DBL) 0x80000001, (FIXP_DBL) 0x00000000, (FIXP_DBL) 0x02000000, (FIXP_DBL) 0x032b8034, (FIXP_DBL) 0x04000000, (FIXP_DBL) 0x04a4d3c2, (FIXP_DBL) 0x052b8034, (FIXP_DBL) 0x059d5da0,
+      (FIXP_DBL) 0x06000000, (FIXP_DBL) 0x06570069, (FIXP_DBL) 0x06a4d3c2, (FIXP_DBL) 0x06eb3a9f, (FIXP_DBL) 0x072b8034, (FIXP_DBL) 0x0766a009, (FIXP_DBL) 0x079d5da0, (FIXP_DBL) 0x07d053f7,
+      (FIXP_DBL) 0x08000000, (FIXP_DBL) 0x082cc7ee, (FIXP_DBL) 0x08570069, (FIXP_DBL) 0x087ef05b, (FIXP_DBL) 0x08a4d3c2, (FIXP_DBL) 0x08c8ddd4, (FIXP_DBL) 0x08eb3a9f, (FIXP_DBL) 0x090c1050,
+      (FIXP_DBL) 0x092b8034, (FIXP_DBL) 0x0949a785, (FIXP_DBL) 0x0966a009, (FIXP_DBL) 0x0982809d, (FIXP_DBL) 0x099d5da0, (FIXP_DBL) 0x09b74949, (FIXP_DBL) 0x09d053f7, (FIXP_DBL) 0x09e88c6b,
+      (FIXP_DBL) 0x0a000000, (FIXP_DBL) 0x0a16bad3, (FIXP_DBL) 0x0a2cc7ee, (FIXP_DBL) 0x0a423162, (FIXP_DBL) 0x0a570069, (FIXP_DBL) 0x0a6b3d79, (FIXP_DBL) 0x0a7ef05b, (FIXP_DBL) 0x0a92203d,
+      (FIXP_DBL) 0x0aa4d3c2, (FIXP_DBL) 0x0ab7110e, (FIXP_DBL) 0x0ac8ddd4, (FIXP_DBL) 0x0ada3f60, (FIXP_DBL) 0x0aeb3a9f, (FIXP_DBL) 0x0afbd42b, (FIXP_DBL) 0x0b0c1050, (FIXP_DBL) 0x0b1bf312,
+      (FIXP_DBL) 0x0b2b8034, (FIXP_DBL) 0x0b3abb40, (FIXP_DBL) 0x0b49a785, (FIXP_DBL) 0x0b584822, (FIXP_DBL) 0x0b66a009, (FIXP_DBL) 0x0b74b1fd, (FIXP_DBL) 0x0b82809d, (FIXP_DBL) 0x0b900e61,
+      (FIXP_DBL) 0x0b9d5da0, (FIXP_DBL) 0x0baa708f, (FIXP_DBL) 0x0bb74949, (FIXP_DBL) 0x0bc3e9ca, (FIXP_DBL) 0x0bd053f7, (FIXP_DBL) 0x0bdc899b, (FIXP_DBL) 0x0be88c6b, (FIXP_DBL) 0x0bf45e09,
+      (FIXP_DBL) 0x0c000000, (FIXP_DBL) 0x0c0b73cb, (FIXP_DBL) 0x0c16bad3, (FIXP_DBL) 0x0c21d671, (FIXP_DBL) 0x0c2cc7ee, (FIXP_DBL) 0x0c379085, (FIXP_DBL) 0x0c423162, (FIXP_DBL) 0x0c4caba8,
+      (FIXP_DBL) 0x0c570069, (FIXP_DBL) 0x0c6130af, (FIXP_DBL) 0x0c6b3d79, (FIXP_DBL) 0x0c7527b9, (FIXP_DBL) 0x0c7ef05b, (FIXP_DBL) 0x0c88983f, (FIXP_DBL) 0x0c92203d, (FIXP_DBL) 0x0c9b8926,
+      (FIXP_DBL) 0x0ca4d3c2, (FIXP_DBL) 0x0cae00d2, (FIXP_DBL) 0x0cb7110e, (FIXP_DBL) 0x0cc0052b, (FIXP_DBL) 0x0cc8ddd4, (FIXP_DBL) 0x0cd19bb0, (FIXP_DBL) 0x0cda3f60, (FIXP_DBL) 0x0ce2c97d,
+      (FIXP_DBL) 0x0ceb3a9f, (FIXP_DBL) 0x0cf39355, (FIXP_DBL) 0x0cfbd42b, (FIXP_DBL) 0x0d03fda9, (FIXP_DBL) 0x0d0c1050, (FIXP_DBL) 0x0d140ca0, (FIXP_DBL) 0x0d1bf312, (FIXP_DBL) 0x0d23c41d,
+      (FIXP_DBL) 0x0d2b8034, (FIXP_DBL) 0x0d3327c7, (FIXP_DBL) 0x0d3abb40, (FIXP_DBL) 0x0d423b08, (FIXP_DBL) 0x0d49a785, (FIXP_DBL) 0x0d510118, (FIXP_DBL) 0x0d584822, (FIXP_DBL) 0x0d5f7cff,
+      (FIXP_DBL) 0x0d66a009, (FIXP_DBL) 0x0d6db197, (FIXP_DBL) 0x0d74b1fd, (FIXP_DBL) 0x0d7ba190, (FIXP_DBL) 0x0d82809d, (FIXP_DBL) 0x0d894f75, (FIXP_DBL) 0x0d900e61, (FIXP_DBL) 0x0d96bdad,
+      (FIXP_DBL) 0x0d9d5da0, (FIXP_DBL) 0x0da3ee7f, (FIXP_DBL) 0x0daa708f, (FIXP_DBL) 0x0db0e412, (FIXP_DBL) 0x0db74949, (FIXP_DBL) 0x0dbda072, (FIXP_DBL) 0x0dc3e9ca, (FIXP_DBL) 0x0dca258e,
+      (FIXP_DBL) 0x0dd053f7, (FIXP_DBL) 0x0dd6753e, (FIXP_DBL) 0x0ddc899b, (FIXP_DBL) 0x0de29143, (FIXP_DBL) 0x0de88c6b, (FIXP_DBL) 0x0dee7b47, (FIXP_DBL) 0x0df45e09, (FIXP_DBL) 0x0dfa34e1,
+      (FIXP_DBL) 0x0e000000, (FIXP_DBL) 0x0e05bf94, (FIXP_DBL) 0x0e0b73cb, (FIXP_DBL) 0x0e111cd2, (FIXP_DBL) 0x0e16bad3, (FIXP_DBL) 0x0e1c4dfb, (FIXP_DBL) 0x0e21d671, (FIXP_DBL) 0x0e275460,
+      (FIXP_DBL) 0x0e2cc7ee, (FIXP_DBL) 0x0e323143, (FIXP_DBL) 0x0e379085, (FIXP_DBL) 0x0e3ce5d8, (FIXP_DBL) 0x0e423162, (FIXP_DBL) 0x0e477346, (FIXP_DBL) 0x0e4caba8, (FIXP_DBL) 0x0e51daa8,
+      (FIXP_DBL) 0x0e570069, (FIXP_DBL) 0x0e5c1d0b, (FIXP_DBL) 0x0e6130af, (FIXP_DBL) 0x0e663b74, (FIXP_DBL) 0x0e6b3d79, (FIXP_DBL) 0x0e7036db, (FIXP_DBL) 0x0e7527b9, (FIXP_DBL) 0x0e7a1030,
+      (FIXP_DBL) 0x0e7ef05b, (FIXP_DBL) 0x0e83c857, (FIXP_DBL) 0x0e88983f, (FIXP_DBL) 0x0e8d602e, (FIXP_DBL) 0x0e92203d, (FIXP_DBL) 0x0e96d888, (FIXP_DBL) 0x0e9b8926, (FIXP_DBL) 0x0ea03232,
+      (FIXP_DBL) 0x0ea4d3c2, (FIXP_DBL) 0x0ea96df0, (FIXP_DBL) 0x0eae00d2, (FIXP_DBL) 0x0eb28c7f, (FIXP_DBL) 0x0eb7110e, (FIXP_DBL) 0x0ebb8e96, (FIXP_DBL) 0x0ec0052b, (FIXP_DBL) 0x0ec474e4,
+      (FIXP_DBL) 0x0ec8ddd4, (FIXP_DBL) 0x0ecd4012, (FIXP_DBL) 0x0ed19bb0, (FIXP_DBL) 0x0ed5f0c4, (FIXP_DBL) 0x0eda3f60, (FIXP_DBL) 0x0ede8797, (FIXP_DBL) 0x0ee2c97d, (FIXP_DBL) 0x0ee70525,
+      (FIXP_DBL) 0x0eeb3a9f, (FIXP_DBL) 0x0eef69ff, (FIXP_DBL) 0x0ef39355, (FIXP_DBL) 0x0ef7b6b4, (FIXP_DBL) 0x0efbd42b, (FIXP_DBL) 0x0effebcd, (FIXP_DBL) 0x0f03fda9, (FIXP_DBL) 0x0f0809cf,
+      (FIXP_DBL) 0x0f0c1050, (FIXP_DBL) 0x0f10113b, (FIXP_DBL) 0x0f140ca0, (FIXP_DBL) 0x0f18028d, (FIXP_DBL) 0x0f1bf312, (FIXP_DBL) 0x0f1fde3d, (FIXP_DBL) 0x0f23c41d, (FIXP_DBL) 0x0f27a4c0,
+      (FIXP_DBL) 0x0f2b8034
     };
 
 
diff -Naur fdk-aac-0.1.4.orig/libSBRenc/src/ps_encode.cpp fdk-aac-0.1.4/libSBRenc/src/ps_encode.cpp
--- fdk-aac-0.1.4.orig/libSBRenc/src/ps_encode.cpp	2016-06-12 14:31:40.174999841 -0700
+++ fdk-aac-0.1.4/libSBRenc/src/ps_encode.cpp	2016-06-13 11:27:10.219339422 -0700
@@ -149,21 +149,21 @@
 
 
 static const FIXP_DBL iidQuant_fx[15] = {
-  0xce000000, 0xdc000000, 0xe4000000, 0xec000000, 0xf2000000, 0xf8000000, 0xfc000000, 0x00000000,
-  0x04000000, 0x08000000, 0x0e000000, 0x14000000, 0x1c000000, 0x24000000, 0x32000000
+  (FIXP_DBL) 0xce000000, (FIXP_DBL) 0xdc000000, (FIXP_DBL) 0xe4000000, (FIXP_DBL) 0xec000000, (FIXP_DBL) 0xf2000000, (FIXP_DBL) 0xf8000000, (FIXP_DBL) 0xfc000000, (FIXP_DBL) 0x00000000,
+  (FIXP_DBL) 0x04000000, (FIXP_DBL) 0x08000000, (FIXP_DBL) 0x0e000000, (FIXP_DBL) 0x14000000, (FIXP_DBL) 0x1c000000, (FIXP_DBL) 0x24000000, (FIXP_DBL) 0x32000000
 };
 
 static const FIXP_DBL iidQuantFine_fx[31] = {
-  0x9c000001, 0xa6000001, 0xb0000001, 0xba000001, 0xc4000000, 0xce000000, 0xd4000000, 0xda000000,
-  0xe0000000, 0xe6000000, 0xec000000, 0xf0000000, 0xf4000000, 0xf8000000, 0xfc000000, 0x00000000,
-  0x04000000, 0x08000000, 0x0c000000, 0x10000000, 0x14000000, 0x1a000000, 0x20000000, 0x26000000,
-  0x2c000000, 0x32000000, 0x3c000000, 0x45ffffff, 0x4fffffff, 0x59ffffff, 0x63ffffff
+  (FIXP_DBL) 0x9c000001, (FIXP_DBL) 0xa6000001, (FIXP_DBL) 0xb0000001, (FIXP_DBL) 0xba000001, (FIXP_DBL) 0xc4000000, (FIXP_DBL) 0xce000000, (FIXP_DBL) 0xd4000000, (FIXP_DBL) 0xda000000,
+  (FIXP_DBL) 0xe0000000, (FIXP_DBL) 0xe6000000, (FIXP_DBL) 0xec000000, (FIXP_DBL) 0xf0000000, (FIXP_DBL) 0xf4000000, (FIXP_DBL) 0xf8000000, (FIXP_DBL) 0xfc000000, (FIXP_DBL) 0x00000000,
+  (FIXP_DBL) 0x04000000, (FIXP_DBL) 0x08000000, (FIXP_DBL) 0x0c000000, (FIXP_DBL) 0x10000000, (FIXP_DBL) 0x14000000, (FIXP_DBL) 0x1a000000, (FIXP_DBL) 0x20000000, (FIXP_DBL) 0x26000000,
+  (FIXP_DBL) 0x2c000000, (FIXP_DBL) 0x32000000, (FIXP_DBL) 0x3c000000, (FIXP_DBL) 0x45ffffff, (FIXP_DBL) 0x4fffffff, (FIXP_DBL) 0x59ffffff, (FIXP_DBL) 0x63ffffff 
 };
 
 
 
 static const FIXP_DBL iccQuant[8] = {
-  0x7fffffff, 0x77ef9d7f, 0x6babc97f, 0x4ceaf27f, 0x2f0ed3c0, 0x00000000, 0xb49ba601, 0x80000000
+  (FIXP_DBL) 0x7fffffff, (FIXP_DBL) 0x77ef9d7f, (FIXP_DBL) 0x6babc97f, (FIXP_DBL) 0x4ceaf27f, (FIXP_DBL) 0x2f0ed3c0, (FIXP_DBL) 0x00000000, (FIXP_DBL) 0xb49ba601, (FIXP_DBL) 0x80000000
 };
 
 static FDK_PSENC_ERROR InitPSData(