[FFmpeg-cvslog] r21951 - trunk/libavcodec/get_bits.h

mru subversion
Mon Feb 22 00:28:24 CET 2010


Author: mru
Date: Mon Feb 22 00:28:24 2010
New Revision: 21951

Log:
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.

Modified:
   trunk/libavcodec/get_bits.h

Modified: trunk/libavcodec/get_bits.h
==============================================================================
--- trunk/libavcodec/get_bits.h	Mon Feb 22 00:28:20 2010	(r21950)
+++ trunk/libavcodec/get_bits.h	Mon Feb 22 00:28:24 2010	(r21951)
@@ -422,7 +422,7 @@ static inline void skip_bits1(GetBitCont
  * 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(GetBitC
  * 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);



More information about the ffmpeg-cvslog mailing list