From 50ced76f4b2f58306af99f000c5c7a26aa6938b5 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Wed, 18 Feb 2009 04:42:31 +0000 Subject: [PATCH] check fifo size and realloc if needed Originally committed as revision 17420 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/audiointerleave.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index 9434ed268..d811f2135 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -61,6 +61,7 @@ int ff_audio_interleave_init(AVFormatContext *s, aic->samples = aic->samples_per_frame; aic->time_base = time_base; + aic->fifo_size = 100* *aic->samples; av_fifo_init(&aic->fifo, 100 * *aic->samples); } } @@ -103,6 +104,12 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt AVStream *st = s->streams[pkt->stream_index]; AudioInterleaveContext *aic = st->priv_data; if (st->codec->codec_type == CODEC_TYPE_AUDIO) { + unsigned new_size = av_fifo_size(&aic->fifo) + pkt->size; + if (new_size > aic->fifo_size) { + if (av_fifo_realloc2(&aic->fifo, new_size) < 0) + return -1; + aic->fifo_size = new_size; + } av_fifo_generic_write(&aic->fifo, pkt->data, pkt->size, NULL); } else { // rewrite pts and dts to be decoded time line position -- 2.11.0