ugly, but necessary

[ffmpeg] / libavcodec / rangecoder.c

diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c
index 159607c652371e2e24209568b99dd8f28e6f11dc..10326a565df4c5794d2913b6005c32355b31eed2 100644 (file)
--- a/libavcodec/rangecoder.c
+++ b/libavcodec/rangecoder.c
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 /**
  * @file rangecoder.c
  * Range coder.
@@ -38,7 +38,7 @@
 
 
 void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size){
-    c->bytestream_start= 
+    c->bytestream_start=
     c->bytestream= buf;
     c->bytestream_end= buf + buf_size;
 
@@ -49,7 +49,8 @@ void ff_init_range_encoder(RangeCoder *c, uint8_t *buf, int buf_size){
 }
 
 void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){
-    ff_init_range_encoder(c, buf, buf_size);
+    /* cast to avoid compiler warning */
+    ff_init_range_encoder(c, (uint8_t *) buf, buf_size);
 
     c->low =(*c->bytestream++)<<8;
     c->low+= *c->bytestream++;
@@ -58,16 +59,16 @@ void ff_init_range_decoder(RangeCoder *c, const uint8_t *buf, int buf_size){
 void ff_build_rac_states(RangeCoder *c, int factor, int max_p){
     const int64_t one= 1LL<<32;
     int64_t p;
-    int last_p8, p8, i, j;
+    int last_p8, p8, i;
 
     memset(c->zero_state, 0, sizeof(c->zero_state));
     memset(c-> one_state, 0, sizeof(c-> one_state));
 
 #if 0
     for(i=1; i<256; i++){
-        if(c->one_state[i]) 
+        if(c->one_state[i])
             continue;
-        
+
         p= (i*one + 128) >> 8;
         last_p8= i;
         for(;;){
@@ -92,13 +93,13 @@ void ff_build_rac_states(RangeCoder *c, int factor, int max_p){
         if(p8 <= last_p8) p8= last_p8+1;
         if(last_p8 && last_p8<256 && p8<=max_p)
             c->one_state[last_p8]= p8;
-        
+
         p+= ((one-p)*factor + one/2) >> 32;
         last_p8= p8;
     }
 #endif
     for(i=256-max_p; i<=max_p; i++){
-        if(c->one_state[i]) 
+        if(c->one_state[i])
             continue;
 
         p= (i*one + 128) >> 8;
@@ -108,7 +109,7 @@ void ff_build_rac_states(RangeCoder *c, int factor, int max_p){
         if(p8 > max_p) p8= max_p;
         c->one_state[    i]=     p8;
     }
-    
+
     for(i=0; i<256; i++)
         c->zero_state[i]= 256-c->one_state[256-i];
 #if 0
@@ -142,17 +143,17 @@ int main(){
     uint8_t r[9*SIZE];
     int i;
     uint8_t state[10]= {0};
-    
+
     ff_init_range_encoder(&c, b, SIZE);
     ff_build_rac_states(&c, 0.05*(1LL<<32), 128+64+32+16);
-    
+
     memset(state, 128, sizeof(state));
 
     for(i=0; i<SIZE; i++){
         r[i]= random()%7;
     }
-    
-  
+
+
     for(i=0; i<SIZE; i++){
 START_TIMER
         put_rac(&c, state, r[i]&1);
@@ -160,18 +161,18 @@ STOP_TIMER("put_rac")
     }
 
     ff_put_rac_terminate(&c);
-    
+
     ff_init_range_decoder(&c, b, SIZE);
-    
+
     memset(state, 128, sizeof(state));
-    
+
     for(i=0; i<SIZE; i++){
 START_TIMER
         if( (r[i]&1) != get_rac(&c, state) )
             av_log(NULL, AV_LOG_DEBUG, "rac failure at %d\n", i);
 STOP_TIMER("get_rac")
     }
-    
+
     return 0;
 }