RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dirac_vlc: prevent shifting a 0 by 64 bits when zeroing residue 

Adding a check for bits == 0 would still make Coverity misdetect this,
so just revert to the normal way of setting the residue to 0.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov 2016-07-14 01:26:51 +01:00
parent c4adcff976
commit f41e37b84f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dirac_vlc.c
View File

@ -65,7 +65,7 @@ int ff_dirac_golomb_read_32bit(DiracGolombLUT *lut_ctx, const uint8_t *buf,
coeff |= (res >> (RSIZE_BITS - 2*i - 2)) & 1; coeff |= (res >> (RSIZE_BITS - 2*i - 2)) & 1;
} }
dst[c_idx++] = l->sign * (coeff - 1); dst[c_idx++] = l->sign * (coeff - 1);
SET_RESIDUE(res, 0, 0); res_bits = res = 0;
} }
memcpy(&dst[c_idx], l->ready, LUT_BITS*sizeof(int32_t)); memcpy(&dst[c_idx], l->ready, LUT_BITS*sizeof(int32_t));
@ -104,7 +104,7 @@ int ff_dirac_golomb_read_16bit(DiracGolombLUT *lut_ctx, const uint8_t *buf,
coeff |= (res >> (RSIZE_BITS - 2*i - 2)) & 1; coeff |= (res >> (RSIZE_BITS - 2*i - 2)) & 1;
} }
dst[c_idx++] = l->sign * (coeff - 1); dst[c_idx++] = l->sign * (coeff - 1);
SET_RESIDUE(res, 0, 0); res_bits = res = 0;
} }
for (i = 0; i < LUT_BITS; i++) for (i = 0; i < LUT_BITS; i++)