generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get/show_bits() can read up to MIN_CACHE_BITS bits

Browse Source 
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
This commit is contained in:
Måns Rullgård 2010-02-21 23:28:24 +00:00
parent 976d7bf71c
commit 39261cd8d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/get_bits.h
View File

@ -422,7 +422,7 @@ static inline void skip_bits1(GetBitContext *s){
* reads 0-32 bits. * reads 0-32 bits.
*/ */
static inline unsigned int get_bits_long(GetBitContext *s, int n){ 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{ else{
#ifdef ALT_BITSTREAM_READER_LE #ifdef ALT_BITSTREAM_READER_LE
int ret= get_bits(s, 16); int ret= get_bits(s, 16);
@ -445,7 +445,7 @@ static inline int get_sbits_long(GetBitContext *s, int n) {
* shows 0-32 bits. * shows 0-32 bits.
*/ */
static inline unsigned int show_bits_long(GetBitContext *s, int n){ 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{ else{
GetBitContext gb= *s; GetBitContext gb= *s;
return get_bits_long(&gb, n); return get_bits_long(&gb, n);