Commit e679560d authored by Benoit Fouet's avatar Benoit Fouet

Corrector type fits in 8 bits.

Originally committed as revision 15472 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2c3c87b8
...@@ -51,7 +51,7 @@ typedef struct Indeo3DecodeContext { ...@@ -51,7 +51,7 @@ typedef struct Indeo3DecodeContext {
YUVBufs *ref_frame; YUVBufs *ref_frame;
unsigned char *ModPred; unsigned char *ModPred;
unsigned short *corrector_type; uint8_t *corrector_type;
} Indeo3DecodeContext; } Indeo3DecodeContext;
static const uint8_t corrector_type_0[24] = { static const uint8_t corrector_type_0[24] = {
...@@ -80,7 +80,7 @@ static av_cold void build_modpred(Indeo3DecodeContext *s) ...@@ -80,7 +80,7 @@ static av_cold void build_modpred(Indeo3DecodeContext *s)
s->ModPred[i+7*128] = 2*((i + 5) - ((i + 4) % 9)); s->ModPred[i+7*128] = 2*((i + 5) - ((i + 4) % 9));
} }
s->corrector_type = av_malloc(24 * 256 * sizeof(*s->corrector_type)); s->corrector_type = av_malloc(24 * 256);
for (i=0; i < 24; ++i) { for (i=0; i < 24; ++i) {
for (j=0; j < 256; ++j) { for (j=0; j < 256; ++j) {
...@@ -308,7 +308,7 @@ static void iv_Decode_Chunk(Indeo3DecodeContext *s, ...@@ -308,7 +308,7 @@ static void iv_Decode_Chunk(Indeo3DecodeContext *s,
unsigned char *cur_frm_pos, *ref_frm_pos, *cp, *cp2; unsigned char *cur_frm_pos, *ref_frm_pos, *cp, *cp2;
uint32_t *cur_lp, *ref_lp; uint32_t *cur_lp, *ref_lp;
const uint32_t *correction_lp[2], *correctionloworder_lp[2], *correctionhighorder_lp[2]; const uint32_t *correction_lp[2], *correctionloworder_lp[2], *correctionhighorder_lp[2];
unsigned short *correction_type_sp[2]; uint8_t *correction_type_sp[2];
ustr_t strip_tbl[20], *strip; ustr_t strip_tbl[20], *strip;
int i, j, k, lp1, lp2, flag1, cmd, blks_width, blks_height, region_160_width, int i, j, k, lp1, lp2, flag1, cmd, blks_width, blks_height, region_160_width,
rle_v1, rle_v2, rle_v3; rle_v1, rle_v2, rle_v3;
......
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