From ffedb5c19a2a0f57d686c40b01395befe9f38e67 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Tue, 23 Dec 2008 18:27:06 +0000 Subject: [PATCH] 352l: correct calculating number of bits for storing macroblock offset in RV3/4 Originally committed as revision 16293 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rv34.c | 2 +- libavcodec/rv34data.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 7792cad..294824e 100644 --- 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 e4862a3..95e5572 100644 --- 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. -- 2.7.4