From 62b30077af71ead4bcb4832db0904bd651481eb7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 7 Nov 2015 15:04:22 +0100 Subject: Merging upstream version 1.6~rc1. Signed-off-by: Daniel Baumann --- encoder.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'encoder.h') diff --git a/encoder.h b/encoder.h index 2a92228..996f83b 100644 --- a/encoder.h +++ b/encoder.h @@ -25,7 +25,7 @@ Public License. */ -enum { max_num_trials = 1 << 12, +enum { max_num_trials = 1 << 13, price_shift_bits = 6, price_step_bits = 2 }; @@ -654,12 +654,8 @@ struct LZ_encoder bool member_finished; }; - static inline bool LZe_member_finished( const struct LZ_encoder * const e ) - { - return ( e->member_finished && !Cb_used_bytes( &e->renc.cb ) ); - } - + { return ( e->member_finished && !Cb_used_bytes( &e->renc.cb ) ); } static inline void LZe_free( struct LZ_encoder * const e ) { Re_free( &e->renc ); } -- cgit v1.2.3