mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'
* commit 'ac9d159015a88aa2721b271875d18482f713f354':
proresdec: Properly make sure an index doesn't run past the limit
Conflicts:
libavcodec/proresdec_lgpl.c
See: 30df9789a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
e0fcd0294e
|
@ -496,8 +496,9 @@ static void unpack_alpha(GetBitContext *gb, uint16_t *dst, int num_coeffs,
|
||||||
dst[idx++] = alpha_val >> 6;
|
dst[idx++] = alpha_val >> 6;
|
||||||
else
|
else
|
||||||
dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
|
dst[idx++] = (alpha_val << 2) | (alpha_val >> 6);
|
||||||
if (idx >= num_coeffs)
|
if (idx >= num_coeffs) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
} while (get_bits1(gb));
|
} while (get_bits1(gb));
|
||||||
val = get_bits(gb, 4);
|
val = get_bits(gb, 4);
|
||||||
if (!val)
|
if (!val)
|
||||||
|
|
Loading…
Reference in New Issue