ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavcodec/vp56.h

 /**
  * @file
  * VP5 and VP6 compatible video decoder (common features)
  *
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 176 matching lines @@
 static av_always_inline unsigned int vp56_rac_renorm(VP56RangeCoder *c)
 {
     int shift = ff_vp56_norm_shift[c->high];
     int bits = c->bits;
     unsigned int code_word = c->code_word;
 
     c->high   <<= shift;
     code_word <<= shift;
     bits       += shift;
     if(bits >= 0 && c->buffer < c->end) {
-        code_word |= *c->buffer++ << bits;
-        bits -= 8;
+        code_word |= bytestream_get_be16(&c->buffer) << bits;
+        bits -= 16;
     }
     c->bits = bits;
     return code_word;
 }
 
 #if ARCH_X86
 #include "x86/vp56_arith.h"
 #endif
 
 #ifndef vp56_rac_get_prob
 #define vp56_rac_get_prob vp56_rac_get_prob
 static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
 {
     unsigned int code_word = vp56_rac_renorm(c);
     unsigned int low = 1 + (((c->high - 1) * prob) >> 8);
-    unsigned int low_shift = low << 8;
+    unsigned int low_shift = low << 16;
     int bit = code_word >= low_shift;
 
     c->high = bit ? c->high - low : low;
     c->code_word = bit ? code_word - low_shift : code_word;
 
     return bit;
 }
 #endif
 
 // branchy variant, to be used where there's a branch based on the bit decoded
 static av_always_inline int vp56_rac_get_prob_branchy(VP56RangeCoder *c, int prob)
 {
     unsigned long code_word = vp56_rac_renorm(c);
     unsigned low = 1 + (((c->high - 1) * prob) >> 8);
-    unsigned low_shift = low << 8;
+    unsigned low_shift = low << 16;
 
     if (code_word >= low_shift) {
         c->high     -= low;
         c->code_word = code_word - low_shift;
         return 1;
     }
 
     c->high = low;
     c->code_word = code_word;
     return 0;
 }
 
 static av_always_inline int vp56_rac_get(VP56RangeCoder *c)
 {
     unsigned int code_word = vp56_rac_renorm(c);
     /* equiprobable */
     int low = (c->high + 1) >> 1;
-    unsigned int low_shift = low << 8;
+    unsigned int low_shift = low << 16;
     int bit = code_word >= low_shift;
     if (bit) {
         c->high   -= low;
         code_word -= low_shift;
     } else {
         c->high = low;
     }
 
     c->code_word = code_word;
     return bit;
@@ skipping 101 matching lines @@
     int v = 0;
 
     do {
         v = (v<<1) + vp56_rac_get_prob(c, *prob++);
     } while (*prob);
 
     return v;
 }
 
 #endif /* AVCODEC_VP56_H */