mirror of
https://github.com/libretro/FFmpeg.git
synced 2026-11-13 04:34:56 -10:00
raw: forward avpicture_fill() error code in raw_decode().
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected]
This commit is contained in:
1 parent
8e0b7e2f14
commit
98df2e2414
1 file changed
+4
-1
+4
-1
@@ -119,6 +119,7 @@ static int raw_decode(AVCodecContext *avctx,
|
||||
const uint8_t *buf = avpkt->data;
|
||||
int buf_size = avpkt->size;
|
||||
RawVideoContext *context = avctx->priv_data;
|
||||
int res;
|
||||
|
||||
AVFrame *frame = data;
|
||||
AVPicture *picture = data;
|
||||
@@ -156,7 +157,9 @@ static int raw_decode(AVCodecContext *avctx,
|
||||
avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
|
||||
buf += buf_size - context->length;
|
||||
|
||||
avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height);
|
||||
if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
|
||||
avctx->width, avctx->height)) < 0)
|
||||
return res;
|
||||
if((avctx->pix_fmt==PIX_FMT_PAL8 && buf_size < context->length) ||
|
||||
(av_pix_fmt_descriptors[avctx->pix_fmt].flags & PIX_FMT_PSEUDOPAL)) {
|
||||
frame->data[1]= context->palette;
|
||||
|
||||
Reference in new issue
Block a user