generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qdrw: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-19 10:38:03 +01:00
parent 8f17829455
commit 688b132b88
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/qdrw.c
View File

@ -45,7 +45,7 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame * const p = &a->pic; AVFrame * const p = &a->pic;
uint8_t* outdata; uint8_t* outdata;
int colors; int colors;
int i; int i, ret;
uint32_t *pal; uint32_t *pal;
int r, g, b; int r, g, b;
@ -53,9 +53,9 @@ static int decode_frame(AVCodecContext *avctx,
avctx->release_buffer(avctx, p); avctx->release_buffer(avctx, p);
p->reference= 0; p->reference= 0;
if(ff_get_buffer(avctx, p) < 0){ if ((ret = ff_get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return ret;
} }
p->pict_type= AV_PICTURE_TYPE_I; p->pict_type= AV_PICTURE_TYPE_I;
p->key_frame= 1; p->key_frame= 1;
@ -70,7 +70,7 @@ static int decode_frame(AVCodecContext *avctx,
if(colors < 0 || colors > 256) { if(colors < 0 || colors > 256) {
av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors);
return -1; return AVERROR_INVALIDDATA;
} }
if (buf_end - buf < (colors + 1) * 8) if (buf_end - buf < (colors + 1) * 8)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;