virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lavc/rawdec: fix various bogus error codes and add some logs

Browse Source 
Help debugging.
This commit is contained in:
Stefano Sabatini 2012-06-14 13:10:14 +02:00
parent 3cc1a89881
commit 6808759a58
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/rawdec.c
View File

@ -109,7 +109,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
context->length = avpicture_get_size(avctx->pix_fmt, FFALIGN(avctx->width, 16), avctx->height); context->length = avpicture_get_size(avctx->pix_fmt, FFALIGN(avctx->width, 16), avctx->height);
context->buffer = av_malloc(context->length); context->buffer = av_malloc(context->length);
if (!context->buffer) if (!context->buffer)
return -1; return AVERROR(ENOMEM);
} else { } else {
context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
} }
@ -139,7 +139,7 @@ static int raw_decode(AVCodecContext *avctx,
int buf_size = avpkt->size; int buf_size = avpkt->size;
int linesize_align = 4; int linesize_align = 4;
RawVideoContext *context = avctx->priv_data; RawVideoContext *context = avctx->priv_data;
int res; int res, len;
AVFrame *frame = data; AVFrame *frame = data;
AVPicture *picture = data; AVPicture *picture = data;
@ -188,8 +188,11 @@ static int raw_decode(AVCodecContext *avctx,
avctx->codec_tag == MKTAG('A', 'V', 'u', 'p')) avctx->codec_tag == MKTAG('A', 'V', 'u', 'p'))
buf += buf_size - context->length; buf += buf_size - context->length;
if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0)) len = context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0);
return -1; if (buf_size < len) {
av_log(avctx, AV_LOG_ERROR, "Invalid buffer size, packet size %d < expected length %d\n", buf_size, len);
return AVERROR(EINVAL);
}
if ((res = avpicture_fill(picture, buf, avctx->pix_fmt, if ((res = avpicture_fill(picture, buf, avctx->pix_fmt,
avctx->width, avctx->height)) < 0) avctx->width, avctx->height)) < 0)