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

avcodec/magicyuv: fix decoding of raw slices 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-06-02 06:59:46 +02:00
parent 7e0623b70b
commit a3c2a9c736
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/magicyuv.c
View File

@ -124,26 +124,37 @@ static int decode_slice(AVCodecContext *avctx, void *tdata,
int sheight = AV_CEIL_RSHIFT(s->slice_height, s->vshift[i]); int sheight = AV_CEIL_RSHIFT(s->slice_height, s->vshift[i]);
int fake_stride = p->linesize[i] * (1 + interlaced); int fake_stride = p->linesize[i] * (1 + interlaced);
int stride = p->linesize[i]; int stride = p->linesize[i];
int pred; int flags, pred;
if ((ret = init_get_bits8(&b, s->buf + s->slices[i][j].start, s->slices[i][j].size)) < 0) if ((ret = init_get_bits8(&b, s->buf + s->slices[i][j].start, s->slices[i][j].size)) < 0)
return ret; return ret;
pred = get_bits(&b, 16); flags = get_bits(&b, 8);
pred = get_bits(&b, 8);
dst = p->data[i] + j * sheight * stride; dst = p->data[i] + j * sheight * stride;
for (k = 0; k < height; k++) { if (flags & 1) {
for (x = 0; x < width; x++) { for (k = 0; k < height; k++) {
int pix; for (x = 0; x < width; x++) {
if (get_bits_left(&b) <= 0) { dst[x] = get_bits(&b, 8);
return AVERROR_INVALIDDATA;
} }
pix = get_vlc2(&b, s->vlc[i].table, s->vlc[i].bits, 3); dst += stride;
if (pix < 0) { }
return AVERROR_INVALIDDATA; } else {
} for (k = 0; k < height; k++) {
dst[x] = 255 - pix; for (x = 0; x < width; x++) {
int pix;
if (get_bits_left(&b) <= 0) {
return AVERROR_INVALIDDATA;
}
pix = get_vlc2(&b, s->vlc[i].table, s->vlc[i].bits, 3);
if (pix < 0) {
return AVERROR_INVALIDDATA;
}
dst[x] = 255 - pix;
}
dst += stride;
} }
dst += stride;
} }
if (pred == LEFT) { if (pred == LEFT) {