From a74d7218767bbf978f66c9b4c2bb77f7d77e9bde Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 28 Mar 2012 14:52:27 +0200 Subject: [PATCH] indeo4: apply correction to eob/esc indexes too Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/indeo4.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 488f97120a..15ed5f7c78 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -631,6 +631,10 @@ static int decode_band(IVI4DecContext *ctx, int plane_num, idx2 = band->corr[i * 2 + 1]; 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]); + 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); @@ -670,6 +674,10 @@ static int decode_band(IVI4DecContext *ctx, int plane_num, idx2 = band->corr[i * 2 + 1]; 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]); + 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