From 555e2921ddc48e84ce8890662c3b7fcd0594a45e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 14 May 2012 01:36:40 +0200 Subject: [PATCH] flac_parser: speedup fifo realloc Fixes Ticket1121 Signed-off-by: Michael Niedermayer --- libavcodec/flac_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index 217461f828..3d2b88262f 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -561,8 +561,8 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx, } /* Fill the buffer. */ - if (av_fifo_realloc2(fpc->fifo_buf, - (read_end - read_start) + av_fifo_size(fpc->fifo_buf)) < 0) { + if ( av_fifo_space(fpc->fifo_buf) < read_end - read_start + && av_fifo_realloc2(fpc->fifo_buf, (read_end - read_start) + 2*av_fifo_size(fpc->fifo_buf)) < 0) { av_log(avctx, AV_LOG_ERROR, "couldn't reallocate buffer of size %td\n", (read_end - read_start) + av_fifo_size(fpc->fifo_buf));