Commit a74d7218 authored by Michael Niedermayer's avatar Michael Niedermayer

indeo4: apply correction to eob/esc indexes too

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 92f7f1db
...@@ -631,6 +631,10 @@ static int decode_band(IVI4DecContext *ctx, int plane_num, ...@@ -631,6 +631,10 @@ static int decode_band(IVI4DecContext *ctx, int plane_num,
idx2 = band->corr[i * 2 + 1]; idx2 = band->corr[i * 2 + 1];
FFSWAP(uint8_t, band->rv_map->runtab[idx1], band->rv_map->runtab[idx2]); FFSWAP(uint8_t, band->rv_map->runtab[idx1], band->rv_map->runtab[idx2]);
FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]); FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]);
if (idx1 == band->rv_map->eob_sym || idx2 == band->rv_map->eob_sym)
band->rv_map->eob_sym ^= idx1 ^ idx2;
if (idx1 == band->rv_map->esc_sym || idx2 == band->rv_map->esc_sym)
band->rv_map->esc_sym ^= idx1 ^ idx2;
} }
pos = get_bits_count(&ctx->gb); pos = get_bits_count(&ctx->gb);
...@@ -670,6 +674,10 @@ static int decode_band(IVI4DecContext *ctx, int plane_num, ...@@ -670,6 +674,10 @@ static int decode_band(IVI4DecContext *ctx, int plane_num,
idx2 = band->corr[i * 2 + 1]; idx2 = band->corr[i * 2 + 1];
FFSWAP(uint8_t, band->rv_map->runtab[idx1], band->rv_map->runtab[idx2]); FFSWAP(uint8_t, band->rv_map->runtab[idx1], band->rv_map->runtab[idx2]);
FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]); FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]);
if (idx1 == band->rv_map->eob_sym || idx2 == band->rv_map->eob_sym)
band->rv_map->eob_sym ^= idx1 ^ idx2;
if (idx1 == band->rv_map->esc_sym || idx2 == band->rv_map->esc_sym)
band->rv_map->esc_sym ^= idx1 ^ idx2;
} }
#if defined(DEBUG) && IVI4_DEBUG_CHECKSUM #if defined(DEBUG) && IVI4_DEBUG_CHECKSUM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment