From 39261cd8d992322ce8ad77ee76a63a683cca21b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sun, 21 Feb 2010 23:28:24 +0000 Subject: [PATCH] get/show_bits() can read up to MIN_CACHE_BITS bits The limit for get/show_bits_long() to use get/show_bits() directly should be MIN_CACHE_BITS, not 17. Originally committed as revision 21951 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/get_bits.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 7c4ee4386c..c325778d67 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -422,7 +422,7 @@ static inline void skip_bits1(GetBitContext *s){ * reads 0-32 bits. */ static inline unsigned int get_bits_long(GetBitContext *s, int n){ - if(n<=17) return get_bits(s, n); + if(n<=MIN_CACHE_BITS) return get_bits(s, n); else{ #ifdef ALT_BITSTREAM_READER_LE int ret= get_bits(s, 16); @@ -445,7 +445,7 @@ static inline int get_sbits_long(GetBitContext *s, int n) { * shows 0-32 bits. */ static inline unsigned int show_bits_long(GetBitContext *s, int n){ - if(n<=17) return show_bits(s, n); + if(n<=MIN_CACHE_BITS) return show_bits(s, n); else{ GetBitContext gb= *s; return get_bits_long(&gb, n);