X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=wma_afh.c;h=6bf2d64134539f07237fb31db9a83a7629db3f83;hb=9264932e;hp=b405989636791e9a37adcd4ea4f5ae4719f478ae;hpb=2ddd3e0c78a3446d227892002a648a744668988b;p=paraslash.git

diff --git a/wma_afh.c b/wma_afh.c
index b4059896..6bf2d641 100644
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -38,8 +38,7 @@ static int count_frames(const char *buf, int buf_size, uint32_t packet_size,
 		sfc++;
 	}
 	PARA_INFO_LOG("%d frames, %d superframes\n", fc, sfc);
-	if (num_superframes)
-		*num_superframes = sfc;
+	*num_superframes = sfc;
 	return fc;
 }
 
@@ -68,7 +67,7 @@ static int put_utf8(uint32_t val, char *result)
 		*out++ = in;
 		return 1;
 	}
-	bytes = (wma_log2(in) + 4) / 5;
+	bytes = DIV_ROUND_UP(wma_log2(in), 5);
 	shift = (bytes - 1) * 6;
 	*out++ = (256 - (256 >> bytes)) | (in >> shift);
 	while (shift >= 6) {