RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

anm: return meaningful error codes

Browse Source
This commit is contained in:
Anton Khirnov 2012-11-14 14:01:50 +01:00
parent 18009e60d2
commit b622e2b540
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/anm.c
View File

@ -44,7 +44,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->frame.reference = 1; s->frame.reference = 1;
bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size); bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size);
if (bytestream2_get_bytes_left(&s->gb) < 16 * 8 + 4 * 256) if (bytestream2_get_bytes_left(&s->gb) < 16 * 8 + 4 * 256)
return -1; return AVERROR_INVALIDDATA;
bytestream2_skipu(&s->gb, 16 * 8); bytestream2_skipu(&s->gb, 16 * 8);
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
@ -111,11 +111,11 @@ static int decode_frame(AVCodecContext *avctx,
AnmContext *s = avctx->priv_data; AnmContext *s = avctx->priv_data;
const int buf_size = avpkt->size; const int buf_size = avpkt->size;
uint8_t *dst, *dst_end; uint8_t *dst, *dst_end;
int count; int count, ret;
if(avctx->reget_buffer(avctx, &s->frame) < 0){ if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 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;
} }
dst = s->frame.data[0]; dst = s->frame.data[0];
dst_end = s->frame.data[0] + s->frame.linesize[0]*avctx->height; dst_end = s->frame.data[0] + s->frame.linesize[0]*avctx->height;