Index: /libmpc/trunk/include/mpc/mpc_types.h
===================================================================
--- /libmpc/trunk/include/mpc/mpc_types.h	(revision 358)
+++ /libmpc/trunk/include/mpc/mpc_types.h	(revision 359)
@@ -77,6 +77,6 @@
 
 typedef struct mpc_quantizer {
-	mpc_int32_t  L [36];
-	mpc_int32_t  R [36];
+	mpc_int16_t  L [36];
+	mpc_int16_t  R [36];
 } mpc_quantizer;
 
Index: /libmpc/trunk/libmpcdec/mpc_decoder.c
===================================================================
--- /libmpc/trunk/libmpcdec/mpc_decoder.c	(revision 358)
+++ /libmpc/trunk/libmpcdec/mpc_decoder.c	(revision 359)
@@ -205,6 +205,6 @@
     MPC_SAMPLE_FORMAT* YL;
     MPC_SAMPLE_FORMAT* YR;
-    mpc_int32_t*    L;
-    mpc_int32_t*    R;
+    mpc_int16_t*    L;
+    mpc_int16_t*    R;
 	const mpc_int32_t Last_Band = d->max_band;
 
@@ -453,5 +453,5 @@
     /***************************** Samples ****************************/
     for ( n = 0; n < Max_used_Band; n++ ) {
-		mpc_int32_t *q = d->Q[n].L, Res = d->Res_L[n];
+		mpc_int16_t *q = d->Q[n].L, Res = d->Res_L[n];
 		do {
 			mpc_int32_t k;
@@ -615,5 +615,5 @@
 	/***************************** Samples ****************************/
 	for ( n = 0; n < Max_used_Band; n++ ) {
-		mpc_int32_t *q = d->Q[n].L, Res = d->Res_L[n];
+		mpc_int16_t *q = d->Q[n].L, Res = d->Res_L[n];
 		static const unsigned int thres[] = {0, 0, 3, 0, 0, 1, 3, 4, 8};
 		static const mpc_int8_t HuffQ2_var[5*5*5] =
Index: /libmpc/trunk/libmpcdec/requant.c
===================================================================
--- /libmpc/trunk/libmpcdec/requant.c	(revision 358)
+++ /libmpc/trunk/libmpcdec/requant.c	(revision 359)
@@ -43,5 +43,5 @@
 /* C O N S T A N T S */
 // Bits per sample for chosen quantizer
-const mpc_uint32_t  Res_bit [18] = {
+const mpc_uint8_t  Res_bit [18] = {
     0,  0,  0,  0,  0,  0,  0,  0,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16
 };
@@ -65,5 +65,5 @@
 // Requantization offset
 // 2*D+1 = steps of quantizer
-const mpc_int32_t  __Dc [1 + 18] = {
+const mpc_int16_t  __Dc [1 + 18] = {
       2,
       0,     1,     2,     3,     4,     7,    15,    31,    63,
Index: /libmpc/trunk/libmpcdec/requant.h
===================================================================
--- /libmpc/trunk/libmpcdec/requant.h	(revision 358)
+++ /libmpc/trunk/libmpcdec/requant.h	(revision 359)
@@ -48,7 +48,7 @@
 
 /* C O N S T A N T S */
-const mpc_uint32_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
+const mpc_uint8_t      Res_bit [18];     ///< Bits per sample for chosen quantizer
 const MPC_SAMPLE_FORMAT __Cc    [1 + 18]; ///< Requantization coefficients
-const mpc_int32_t       __Dc    [1 + 18]; ///< Requantization offset
+const mpc_int16_t       __Dc    [1 + 18]; ///< Requantization offset
 
 #define Cc (__Cc + 1)
Index: /libmpc/trunk/libmpcenc/encode_sv7.c
===================================================================
--- /libmpc/trunk/libmpcenc/encode_sv7.c	(revision 358)
+++ /libmpc/trunk/libmpcenc/encode_sv7.c	(revision 359)
@@ -301,5 +301,5 @@
 	for ( n = 0; n < MaxBand; n++ ) {
 		int Res = Res_L[n];
-		const int * q = e->Q[n].L;
+		const mpc_int16_t * q = e->Q[n].L;
 		static const unsigned int thres[] = {0, 0, 3, 7, 9, 1, 3, 4, 8};
 		static const int HuffQ2_var[5*5*5] =
Index: /libmpc/trunk/libmpcenc/quant.c
===================================================================
--- /libmpc/trunk/libmpcenc/quant.c	(revision 358)
+++ /libmpc/trunk/libmpcenc/quant.c	(revision 359)
@@ -243,5 +243,5 @@
 // Linear quantizer for a subband
 void
-QuantizeSubband ( unsigned int* qu_output, const float* input, const int res, float* errors, const int maxNsOrder )
+QuantizeSubband ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const int maxNsOrder )
 {
 	int    n, quant;
@@ -281,5 +281,5 @@
 // NoiseShaper for a subband
 void
-QuantizeSubbandWithNoiseShaping ( unsigned int* qu_output, const float* input, const int res, float* errors, const float* FIR )
+QuantizeSubbandWithNoiseShaping ( mpc_int16_t* qu_output, const float* input, const int res, float* errors, const float* FIR )
 {
     float  signal;
Index: /libmpc/trunk/mpc2sv8/mpc2sv8.c
===================================================================
--- /libmpc/trunk/mpc2sv8/mpc2sv8.c	(revision 358)
+++ /libmpc/trunk/mpc2sv8/mpc2sv8.c	(revision 359)
@@ -70,5 +70,5 @@
 
 	for( i = 0; i <= d->max_band; i++){
-		mpc_int32_t * q_d = d->Q[i].L, * q_e = e->Q[i].L, Res = d->Res_L[i];
+		mpc_int16_t * q_d = d->Q[i].L, * q_e = e->Q[i].L, Res = d->Res_L[i];
 
 		if (Res > 0)