From: Luca Barbato <[email protected]>
---
libavcodec/bmp_parser.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/libavcodec/bmp_parser.c b/libavcodec/bmp_parser.c
index b85dd8b..60acb0c 100644
--- a/libavcodec/bmp_parser.c
+++ b/libavcodec/bmp_parser.c
@@ -42,7 +42,7 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext
*avctx,
BMPParseContext *bpc = s->priv_data;
uint64_t state = bpc->pc.state64;
int next = END_NOT_FOUND;
- int i = 0;
+ int i = 0, ret;
*poutbuf_size = 0;
if (buf_size == 0)
@@ -73,7 +73,10 @@ static int bmp_parse(AVCodecParserContext *s, AVCodecContext
*avctx,
}
flush:
- if (ff_combine_frame(&bpc->pc, next, &buf, &buf_size) < 0)
+ ret = ff_combine_frame(&bpc->pc, next, &buf, &buf_size);
+ if (ret == AVERROR(ENOMEM))
+ return ret;
+ if (ret == AVERROR(EAGAIN))
return buf_size;
bpc->pc.frame_start_found = 0;
--
1.9.3 (Apple Git-50)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
