> From d6a5f219ab10092fa34df8e63d3ebdac50cdcf37 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <[email protected]> > Date: Tue, 5 Apr 2011 00:29:01 +0200 > Subject: [PATCH] oggdec: fix streaming with continuous audio streams > (issue2337) >
Patch updated (initial renamed to initmode, fix streams memleaks and only functionnal changes) -- Clément B.
From b686906d82d36b14236ce677bdf881f48a67bc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <[email protected]> Date: Tue, 5 Apr 2011 00:29:01 +0200 Subject: [PATCH] oggdec: fix streaming with continuous audio streams (issue2337) --- libavformat/oggdec.c | 16 ++++++++++++++++ libavformat/oggdec.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index cd866d4..dd2361c 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -164,6 +164,7 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial) os->bufsize = DECODER_BUFFER_SIZE; os->buf = av_malloc(os->bufsize); os->header = -1; + os->initmode = 1; st = av_new_stream (s, idx); if (!st) @@ -241,12 +242,27 @@ ogg_read_page (AVFormatContext * s, int *str) idx = ogg_find_stream (ogg, serial); if (idx < 0){ + for (i = 0; i < ogg->nstreams; i++) { + if (!ogg->streams[i].initmode) { + int n; + + for (n = 0; n < ogg->nstreams; n++) { + av_free(ogg->streams[n].buf); + av_free(ogg->streams[n].private); + } + ogg->curidx = -1; + ogg->nstreams = 0; + break; + } + } idx = ogg_new_stream (s, serial); if (idx < 0) return -1; } os = ogg->streams + idx; + if (!(flags & OGG_FLAG_BOS)) + os->initmode = 0; os->page_pos = avio_tell(bc) - 27; if(os->psize > 0) diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 7d66cd5..b6f9e6a 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -75,6 +75,7 @@ struct ogg_stream { int incomplete; ///< whether we're expecting a continuation in the next page int page_end; ///< current packet is the last one completed in the page int keyframe_seek; + int initmode; void *private; }; -- 1.7.4.2
pgpMe86y3Lit7.pgp
Description: PGP signature
_______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
