From 8f8320d7c32c375e86712aa406465c30a27eb8d3 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Thu, 11 Mar 2010 07:17:46 +0000 Subject: oggdec: Don't use ogg_stream's seq for vorbis or speex headers Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggparsespeex.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'libavformat/oggparsespeex.c') diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c index 14d2b38131..395ae59377 100644 --- a/libavformat/oggparsespeex.c +++ b/libavformat/oggparsespeex.c @@ -32,18 +32,25 @@ struct speex_params { int final_packet_duration; + int seq; }; static int speex_header(AVFormatContext *s, int idx) { struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; + struct speex_params *spxp = os->private; AVStream *st = s->streams[idx]; uint8_t *p = os->buf + os->pstart; - if (os->seq > 1) + if (!spxp) { + spxp = av_mallocz(sizeof(*spxp)); + os->private = spxp; + } + + if (spxp->seq > 1) return 0; - if (os->seq == 0) { + if (spxp->seq == 0) { int frames_per_packet; st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_SPEEX; @@ -70,6 +77,7 @@ static int speex_header(AVFormatContext *s, int idx) { } else vorbis_comment(s, p, os->psize); + spxp->seq++; return 1; } @@ -90,11 +98,6 @@ static int speex_packet(AVFormatContext *s, int idx) struct speex_params *spxp = os->private; int packet_size = s->streams[idx]->codec->frame_size; - if (!spxp) { - spxp = av_mallocz(sizeof(*spxp)); - os->private = spxp; - } - if (os->flags & OGG_FLAG_EOS && os->lastpts != AV_NOPTS_VALUE && os->granule > 0) { /* first packet of final page. we have to calculate the final packet -- cgit v1.2.3