[FFmpeg-cvslog] libavutil/fifo: Fix fifo grow step

Jan Sebechlebsky git at videolan.org
Fri Jun 3 20:07:33 CEST 2016


ffmpeg | branch: master | Jan Sebechlebsky <sebechlebskyjan at gmail.com> | Fri Jun  3 14:04:00 2016 +0200| [0e84eee7198d9e261f0efc5a0831abc55aa66fd6] | committer: Michael Niedermayer

libavutil/fifo: Fix fifo grow step

Fifo was reallocating always to twice of the requested size.
This fixes it to reallocate to requested size, or twice of the
original size - whichever is greater.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e84eee7198d9e261f0efc5a0831abc55aa66fd6
---

 libavutil/fifo.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/fifo.c b/libavutil/fifo.c
index 986729a..1060aed 100644
--- a/libavutil/fifo.c
+++ b/libavutil/fifo.c
@@ -113,7 +113,7 @@ int av_fifo_grow(AVFifoBuffer *f, unsigned int size)
     size += av_fifo_size(f);
 
     if (old_size < size)
-        return av_fifo_realloc2(f, FFMAX(size, 2*size));
+        return av_fifo_realloc2(f, FFMAX(size, 2*old_size));
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list