352l: correct calculating number of bits for storing macroblock offset in RV3/4

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16293 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 7792cad565086e785eb236b54bf5242cf95a59f7..294824edb1c30c858cfcf65c8b88e0dde27a3928 100644 (file)
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -367,7 +367,7 @@ int ff_rv34_get_start_offset(GetBitContext *gb, int mb_size)
 {
     int i;
     for(i = 0; i < 5; i++)
-        if(rv34_mb_max_sizes[i] > mb_size)
+        if(rv34_mb_max_sizes[i] >= mb_size - 1)
             break;
     return rv34_mb_bits_sizes[i];
 }

diff --git a/libavcodec/rv34data.h b/libavcodec/rv34data.h
index e4862a3ba0d6b8753756b562ec71731c56a16a0d..95e5572df741ff6bbee68da927780e2ee0a9e67c 100644 (file)
--- a/libavcodec/rv34data.h
+++ b/libavcodec/rv34data.h
@@ -138,7 +138,7 @@ static const uint8_t rv34_dquant_tab[2][32]={
  * maximum number of macroblocks for each of the possible slice offset sizes
  * @todo This is the same as ff_mba_max, maybe use it instead.
  */
-static const uint16_t rv34_mb_max_sizes[6] = { 0x2F, 0x68, 0x18B, 0x62F, 0x18BF, 0x23FF };
+static const uint16_t rv34_mb_max_sizes[6] = { 0x2F, 0x62, 0x18B, 0x62F, 0x18BF, 0x23FF };
 /**
  * bits needed to code the slice offset for the given size
  * @todo This is the same as ff_mba_length, maybe use it instead.