src += 2;
if (src+3>src_end)
- return -1;
+ return AVERROR_INVALIDDATA;
size = AV_RB24(src);
src += 3;
const unsigned char *blocks_raw;
if(buf+12>buf_end)
- return -1;
+ return AVERROR_INVALIDDATA;
num_mvs = AV_RL16(&buf[0]);
num_blocks_raw = AV_RL16(&buf[2]);
mvbits = (num_mvs*2*10+31) & ~31;
if (buf+(mvbits>>3)+16*num_blocks_raw+8*num_blocks_packed>buf_end)
- return -1;
+ return AVERROR_INVALIDDATA;
init_get_bits(&gb, buf, mvbits);
for (i=0; i<num_mvs; i++) {
if (get_bits_left(&gb) < vector_bits *
(s->avctx->height/4) * (s->avctx->width/4))
- return -1;
+ return AVERROR_INVALIDDATA;
/* read vectors and build frame */
for(y=0; y<s->avctx->height/4; y++)
int buf_size = avpkt->size;
TgvContext *s = avctx->priv_data;
const uint8_t *buf_end = buf + buf_size;
- int chunk_type;
+ int chunk_type, ret;
chunk_type = AV_RL32(&buf[0]);
buf += EA_PREAMBLE_SIZE;
int pal_count, i;
if(buf+12>buf_end) {
av_log(avctx, AV_LOG_WARNING, "truncated header\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
s->width = AV_RL16(&buf[0]);
}
}
- if (av_image_check_size(s->width, s->height, 0, avctx))
- return -1;
+ if ((ret = av_image_check_size(s->width, s->height, 0, avctx)) < 0)
+ return ret;
/* shuffle */
FFSWAP(AVFrame, s->frame, s->last_frame);
s->frame.pict_type = AV_PICTURE_TYPE_I;
if (unpack(buf, buf_end, s->frame.data[0], s->avctx->width, s->avctx->height)<0) {
av_log(avctx, AV_LOG_WARNING, "truncated intra frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
}else{
if (!s->last_frame.data[0]) {
s->frame.pict_type = AV_PICTURE_TYPE_P;
if (tgv_decode_inter(s, buf, buf_end)<0) {
av_log(avctx, AV_LOG_WARNING, "truncated inter frame\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
}