highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avs: return meaningful error codes.

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-14 16:09:39 +01:00
parent 620faee5d1
commit e83c1e2d0b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/avs.c
View File

@ -54,14 +54,14 @@ avs_decode_frame(AVCodecContext * avctx,
AVFrame *const p = &avs->picture; AVFrame *const p = &avs->picture;
const uint8_t *table, *vect; const uint8_t *table, *vect;
uint8_t *out; uint8_t *out;
int i, j, x, y, stride, vect_w = 3, vect_h = 3; int i, j, x, y, stride, ret, vect_w = 3, vect_h = 3;
AvsVideoSubType sub_type; AvsVideoSubType sub_type;
AvsBlockType type; AvsBlockType type;
GetBitContext change_map; GetBitContext change_map;
if (avctx->reget_buffer(avctx, p)) { if ((ret = avctx->reget_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return -1; return ret;
} }
p->reference = 1; p->reference = 1;
p->pict_type = AV_PICTURE_TYPE_P; p->pict_type = AV_PICTURE_TYPE_P;
@ -94,7 +94,7 @@ avs_decode_frame(AVCodecContext * avctx,
} }
if (type != AVS_VIDEO) if (type != AVS_VIDEO)
return -1; return AVERROR_INVALIDDATA;
switch (sub_type) { switch (sub_type) {
case AVS_I_FRAME: case AVS_I_FRAME:
@ -116,7 +116,7 @@ avs_decode_frame(AVCodecContext * avctx,
break; break;
default: default:
return -1; return AVERROR_INVALIDDATA;
} }
if (buf_end - buf < 256 * vect_w * vect_h) if (buf_end - buf < 256 * vect_w * vect_h)