* qatar/master:
8bps: Make the bound-checks consistent
Conflicts:
libavcodec/8bps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
if ((count = *dp++) <= 127) {
count++;
dlen -= count + 1;
- if (pixptr + count * planes > pixptr_end)
- if (pixptr_end - pixptr < count * px_inc)
++ if (pixptr_end - pixptr < count * planes)
break;
if (ep - dp < count)
return AVERROR_INVALIDDATA;
}
} else {
count = 257 - count;
- if (pixptr + count * planes > pixptr_end)
- if (pixptr_end - pixptr < count * px_inc)
++ if (pixptr_end - pixptr < count * planes)
break;
while (count--) {
*pixptr = *dp;