virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

vqavideo: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-17 08:35:45 +01:00
parent edfe05ddf1
commit 26a161a166
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/vqavideo.c
View File

@ -122,7 +122,7 @@ typedef struct VqaContext {
static av_cold int vqa_decode_init(AVCodecContext *avctx) static av_cold int vqa_decode_init(AVCodecContext *avctx)
{ {
VqaContext *s = avctx->priv_data; VqaContext *s = avctx->priv_data;
int i, j, codebook_index; int i, j, codebook_index, ret;
s->avctx = avctx; s->avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
@ -130,16 +130,16 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
/* make sure the extradata made it */ /* make sure the extradata made it */
if (s->avctx->extradata_size != VQA_HEADER_SIZE) { if (s->avctx->extradata_size != VQA_HEADER_SIZE) {
av_log(s->avctx, AV_LOG_ERROR, " VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE); av_log(s->avctx, AV_LOG_ERROR, " VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE);
return -1; return AVERROR(EINVAL);
} }
/* load up the VQA parameters from the header */ /* load up the VQA parameters from the header */
s->vqa_version = s->avctx->extradata[0]; s->vqa_version = s->avctx->extradata[0];
s->width = AV_RL16(&s->avctx->extradata[6]); s->width = AV_RL16(&s->avctx->extradata[6]);
s->height = AV_RL16(&s->avctx->extradata[8]); s->height = AV_RL16(&s->avctx->extradata[8]);
if(av_image_check_size(s->width, s->height, 0, avctx)){ if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0) {
s->width= s->height= 0; s->width= s->height= 0;
return -1; return ret;
} }
s->vector_width = s->avctx->extradata[10]; s->vector_width = s->avctx->extradata[10];
s->vector_height = s->avctx->extradata[11]; s->vector_height = s->avctx->extradata[11];
@ -149,7 +149,7 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
if ((s->vector_width != 4) || if ((s->vector_width != 4) ||
((s->vector_height != 2) && (s->vector_height != 4))) { ((s->vector_height != 2) && (s->vector_height != 4))) {
/* return without further initialization */ /* return without further initialization */
return -1; return AVERROR_INVALIDDATA;
} }
if (s->width & (s->vector_width - 1) || if (s->width & (s->vector_width - 1) ||
@ -589,9 +589,9 @@ static int vqa_decode_frame(AVCodecContext *avctx,
if (s->frame.data[0]) if (s->frame.data[0])
avctx->release_buffer(avctx, &s->frame); avctx->release_buffer(avctx, &s->frame);
if (ff_get_buffer(avctx, &s->frame)) { if ((res = ff_get_buffer(avctx, &s->frame)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, " VQA Video: get_buffer() failed\n"); av_log(s->avctx, AV_LOG_ERROR, " VQA Video: get_buffer() failed\n");
return -1; return res;
} }
bytestream2_init(&s->gb, avpkt->data, avpkt->size); bytestream2_init(&s->gb, avpkt->data, avpkt->size);