Index: /libmpc/branches/r2d/common/huffman.c
===================================================================
--- /libmpc/branches/r2d/common/huffman.c	(revision 184)
+++ /libmpc/branches/r2d/common/huffman.c	(revision 185)
@@ -103,6 +103,6 @@
 static void _Huffman_MakeCodes(huff_sym_t * sym, unsigned int num_symbols)
 {
-	unsigned int code = 0;
-	int i, bits;
+	unsigned int code = 0, i;
+	int bits;
 
 	qsort(sym, num_symbols, sizeof(huff_sym_t),
@@ -185,4 +185,6 @@
 }
 
+#ifdef __GNUC__
+
 /**
  * Print the huffman tables
@@ -198,6 +200,6 @@
 void _Huffman_PrintCodes(huff_sym_t * sym, unsigned int num_symbols, int print_type, int offset)
 {
-	unsigned int total_cnt = 0, total_size = 0, optim_size = 0;
-	int i, packs[4];
+	unsigned int total_cnt = 0, total_size = 0, optim_size = 0, i;
+	int packs[4];
 
 	switch( print_type ) {
@@ -274,4 +276,5 @@
 }
 
-
-
+#endif
+
+
Index: /libmpc/branches/r2d/include/mpcdec/mpcdec.h
===================================================================
--- /libmpc/branches/r2d/include/mpcdec/mpcdec.h	(revision 184)
+++ /libmpc/branches/r2d/include/mpcdec/mpcdec.h	(revision 185)
@@ -57,7 +57,7 @@
 
 typedef struct mpc_frame_info_t {
-	mpc_uint32_t samples;	/// number of samples in the frame
+	mpc_uint32_t samples;	/// number of samples in the frame (counting once for multiple channels)
 	mpc_int32_t bits;	/// number of bits consumed by this frame (-1) if end of stream
-	MPC_SAMPLE_FORMAT * buffer;	/// frame samples buffer (size = samples * channels * sizeof(MPC_SAMPLE_FORMAT)
+	MPC_SAMPLE_FORMAT * buffer;	/// frame samples buffer (size = samples * channels * sizeof(MPC_SAMPLE_FORMAT))
 	mpc_bool_t is_key_frame; /// 1 if this frame is a key frame (first in block) 0 else. Set by the demuxer.
 } mpc_frame_info;