minor simplifications in cabac_mb_type

[ffmpeg] / libavcodec / rangecoder.h

diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 3c363ac32c848b3b15e6d3dff521bab330a5daa8..0f56fad5906e6bcb3dc45f5908113e9ed9e6f6bb 100644 (file)
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -14,19 +14,15 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
- 
+
 /**
  * @file rangecoder.h
  * Range coder.
  */
 
-
-#undef NDEBUG
-#include <assert.h>
-
 typedef struct RangeCoder{
     int low;
     int range;
@@ -62,7 +58,7 @@ static inline void renorm_encoder(RangeCoder *c){
         }else{
             c->outstanding_count++;
         }
-        
+
         c->low = (c->low & 0xFF)<<8;
         c->range <<= 8;
     }
@@ -82,7 +78,7 @@ static inline void put_rac(RangeCoder *c, uint8_t * const state, int bit){
         c->range = range1;
         *state= c->one_state[*state];
     }
-    
+
     renorm_encoder(c);
 }
 
@@ -98,8 +94,8 @@ static inline void refill(RangeCoder *c){
 
 static inline int get_rac(RangeCoder *c, uint8_t * const state){
     int range1= (c->range * (*state)) >> 8;
-    int one_mask;
-    
+    int attribute_unused one_mask;
+
     c->range -= range1;
 #if 1
     if(c->low < c->range){
@@ -115,12 +111,12 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){
     }
 #else
     one_mask= (c->range - c->low-1)>>31;
-    
+
     c->low -= c->range & one_mask;
     c->range += (range1 - c->range) & one_mask;
-    
+
     *state= c->zero_state[(*state) + (256&one_mask)];
-    
+
     refill(c);
 
     return one_mask&1;