X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=bitstream.h;h=a6349861a55092fcdc1f957d7570621fd51e6834;hp=5890d08c89d4033f7fefb9a19be525860a701d77;hb=a85b3b947174c64ce06b4d6e438677055bf3f1ae;hpb=68630d8b55d688a7c7ce116951c310150aa9c166

diff --git a/bitstream.h b/bitstream.h
index 5890d08c..a6349861 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -36,8 +36,8 @@ struct vlc {
 static inline uint32_t show_bits(struct getbit_context *gbc, int num)
 {
 	int idx = gbc->index;
-	const uint8_t *p = gbc->buffer + (idx >> 3);
-	uint32_t x = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+	const char *p = (const char *)gbc->buffer + (idx >> 3);
+	uint32_t x = read_u32_be(p);
 	return (x << (idx & 7)) >> (32 - num);
 }
 
@@ -62,7 +62,7 @@ static inline unsigned int get_bits(struct getbit_context *gbc, int n)
 static inline unsigned int get_bit(struct getbit_context *gbc)
 {
 	int idx = gbc->index++;
-	uint8_t tmp = gbc->buffer[idx >> 3], mask = (1 << (7 - (idx & 7)));
+	uint8_t tmp = gbc->buffer[idx >> 3], mask = 1 << (7 - (idx & 7));
 	return !!(tmp & mask);
 }
 
@@ -88,5 +88,4 @@ static inline void init_get_bits(struct getbit_context *gbc,
 void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
 		const void *codes, int codes_size);
 void free_vlc(struct vlc *vlc);
-int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits,
-		int max_depth);
+int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits);