virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

lavc/gifdec: do not return nonzero *got_frame if frame is not passed

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-01-25 12:15:13 +00:00
parent aaebdce3d9
commit 285128eedf
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/gifdec.c
View File

@ -409,10 +409,8 @@ static int gif_read_header1(GifState *s)
return 0; return 0;
} }
static int gif_parse_next_image(GifState *s, int *got_picture) static int gif_parse_next_image(GifState *s)
{ {
*got_picture = 1;
while (bytestream2_get_bytes_left(&s->gb)) { while (bytestream2_get_bytes_left(&s->gb)) {
int code = bytestream2_get_byte(&s->gb); int code = bytestream2_get_byte(&s->gb);
int ret; int ret;
@ -428,8 +426,7 @@ static int gif_parse_next_image(GifState *s, int *got_picture)
break; break;
case GIF_TRAILER: case GIF_TRAILER:
/* end of image */ /* end of image */
*got_picture = 0; return AVERROR_EOF;
return 0;
default: default:
/* erroneous block label */ /* erroneous block label */
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -507,11 +504,12 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A
s->picture.key_frame = 0; s->picture.key_frame = 0;
} }
ret = gif_parse_next_image(s, got_frame); ret = gif_parse_next_image(s);
if (ret < 0) if (ret < 0)
return ret; return ret;
else if (*got_frame)
*picture = s->picture; *picture = s->picture;
*got_frame = 1;
return avpkt->size; return avpkt->size;
} }