Index: /libmpc/trunk/libmpcenc/bitstream.c
===================================================================
--- /libmpc/trunk/libmpcenc/bitstream.c	(revision 311)
+++ /libmpc/trunk/libmpcenc/bitstream.c	(revision 312)
@@ -190,5 +190,5 @@
 
 	// write block header (key / length)
-	len = e->pos + 2 + (addCRC > 0) * 4;
+	len = e->pos + (addCRC > 0) * 4;
 	if (min_size <= len)
 		min_size = len;
@@ -197,6 +197,7 @@
 		for(i = 0; i < pad; i++)
 			writeBits(e, 0, 8);
-	}
-	len = encodeSize(min_size, blockSize, MPC_TRUE);
+		emptyBits(e);
+	}
+	len = encodeSize(min_size + 2, blockSize, MPC_TRUE);
 	fwrite(key, sizeof(char), 2, fp);
 	fwrite(blockSize, sizeof(char), len, fp);