From aaed943b403d90335816ae7a8e486ffa834cd383 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 6 Nov 2015 13:50:02 +0100 Subject: Merging upstream version 1.6~pre2. Signed-off-by: Daniel Baumann --- decoder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'decoder.h') diff --git a/decoder.h b/decoder.h index ec82667..03db425 100644 --- a/decoder.h +++ b/decoder.h @@ -158,7 +158,7 @@ static inline int Rd_decode_tree6( struct Range_decoder * const rdec, symbol = ( symbol << 1 ) | Rd_decode_bit( rdec, &bm[symbol] ); symbol = ( symbol << 1 ) | Rd_decode_bit( rdec, &bm[symbol] ); symbol = ( symbol << 1 ) | Rd_decode_bit( rdec, &bm[symbol] ); - return symbol - (1 << 6); + return symbol & 0x3F; } static inline int Rd_decode_tree_reversed( struct Range_decoder * const rdec, -- cgit v1.2.3