| @@ -57,7 +57,7 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst | |||||
| int t; | int t; | ||||
| if(width&1) | if(width&1) | ||||
| return -1; | |||||
| return AVERROR_INVALIDDATA; | |||||
| /* first line contain absolute values, other lines contain deltas */ | /* first line contain absolute values, other lines contain deltas */ | ||||
| while (out < width){ | while (out < width){ | ||||
| @@ -65,7 +65,7 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst | |||||
| if(c >= 0x80) { /* we have a run */ | if(c >= 0x80) { /* we have a run */ | ||||
| c -= 0x7F; | c -= 0x7F; | ||||
| if(out + c*2 > width) | if(out + c*2 > width) | ||||
| return -1; | |||||
| return AVERROR_INVALIDDATA; | |||||
| for (i = 0; i < c * 2; i++) | for (i = 0; i < c * 2; i++) | ||||
| dst[out++] = 0x80; | dst[out++] = 0x80; | ||||
| } else { /* copy two values from table */ | } else { /* copy two values from table */ | ||||
| @@ -82,7 +82,7 @@ static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst | |||||
| if(c >= 0x80) { /* we have a skip */ | if(c >= 0x80) { /* we have a skip */ | ||||
| c -= 0x7F; | c -= 0x7F; | ||||
| if(out + c*2 > width) | if(out + c*2 > width) | ||||
| return -1; | |||||
| return AVERROR_INVALIDDATA; | |||||
| for (i = 0; i < c * 2; i++) { | for (i = 0; i < c * 2; i++) { | ||||
| dst[out] = dst[out - stride]; | dst[out] = dst[out - stride]; | ||||
| out++; | out++; | ||||
| @@ -112,7 +112,7 @@ static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_ | |||||
| int t; | int t; | ||||
| if(width&1) | if(width&1) | ||||
| return -1; | |||||
| return AVERROR_INVALIDDATA; | |||||
| for (j = 0; j < height; j++){ | for (j = 0; j < height; j++){ | ||||
| out = 0; | out = 0; | ||||
| @@ -146,16 +146,16 @@ static int ir2_decode_frame(AVCodecContext *avctx, | |||||
| Ir2Context * const s = avctx->priv_data; | Ir2Context * const s = avctx->priv_data; | ||||
| AVFrame *picture = data; | AVFrame *picture = data; | ||||
| AVFrame * const p = &s->picture; | AVFrame * const p = &s->picture; | ||||
| int start; | |||||
| int start, ret; | |||||
| if(p->data[0]) | if(p->data[0]) | ||||
| avctx->release_buffer(avctx, p); | avctx->release_buffer(avctx, p); | ||||
| p->reference = 1; | p->reference = 1; | ||||
| p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; | p->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE; | ||||
| if (avctx->reget_buffer(avctx, p)) { | |||||
| if ((ret = avctx->reget_buffer(avctx, p)) < 0) { | |||||
| av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | ||||
| return -1; | |||||
| return ret; | |||||
| } | } | ||||
| start = 48; /* hardcoded for now */ | start = 48; /* hardcoded for now */ | ||||