Index: libmpc/branches/r2d/libmpcenc/encode_sv7.c
===================================================================
--- libmpc/branches/r2d/libmpcenc/encode_sv7.c	(revision 149)
+++ libmpc/branches/r2d/libmpcenc/encode_sv7.c	(revision 150)
@@ -105,5 +105,5 @@
 	writeBits ( e, tmp[0]  , 8 );
 
-    writeBits ( e, 0x08,  8 );    // StreamVersion
+    writeBits ( e, 8,  8 );    // StreamVersion
 
 	len = encodeSize(SamplesCount, (char *)tmp, MPC_FALSE);
@@ -112,8 +112,8 @@
 
 	switch ( SampleFreq ) {
-		case 44100: writeBits ( e, 0, 4 ); break;
-		case 48000: writeBits ( e, 1, 4 ); break;
-		case 37800: writeBits ( e, 2, 4 ); break;
-		case 32000: writeBits ( e, 3, 4 ); break;
+		case 44100: writeBits ( e, 0, 3 ); break;
+		case 48000: writeBits ( e, 1, 3 ); break;
+		case 37800: writeBits ( e, 2, 3 ); break;
+		case 32000: writeBits ( e, 3, 3 ); break;
 		default   : fprintf(stderr, "Internal error\n");// FIXME : stderr_printf ( "Internal error\n");
 		exit (1);
@@ -123,6 +123,5 @@
 	writeBits ( e, MaxBand - 1  ,  5 );    // Bandwidth
 	writeBits ( e, MS_on        ,  1 );    // MS-Coding Flag
-	writeBits ( e, FRAMES_PER_BLOCK_PWR,  4 );    // frames per block (log2 unit)
-	writeBits ( e, 0, 6 );    // unused
+	writeBits ( e, FRAMES_PER_BLOCK_PWR >> 1,  3 );    // frames per block (log4 unit)
 
 	writeGainInfo(e);
Index: libmpc/branches/r2d/libmpcenc/libmpcenc.h
===================================================================
--- libmpc/branches/r2d/libmpcenc/libmpcenc.h	(revision 149)
+++ libmpc/branches/r2d/libmpcenc/libmpcenc.h	(revision 150)
@@ -28,5 +28,5 @@
 
 // bitstream.c
-#define FRAMES_PER_BLOCK_PWR 6
+#define FRAMES_PER_BLOCK_PWR 6 // MUST be even
 #define FRAMES_PER_BLOCK (1 << FRAMES_PER_BLOCK_PWR)
 #define BUFFER_FULL         (4352 * FRAMES_PER_BLOCK)         // 34490 bit/frame  1320.3 kbps