From 81b743eb1026547270b88ac6a5cb451a3907ee94 Mon Sep 17 00:00:00 2001 From: David Conrad Date: Fri, 12 Mar 2010 05:17:01 +0000 Subject: oggdec: Pass packets to header() until the stream is done with them This fixes some old ogm files that had the 3rd vorbis header after a data packet in another stream. This is invalid in ogg, but this change shouldn't affect the behaviour of any valid file. Originally committed as revision 22478 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/oggdec.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libavformat/oggdec.c') diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index fda1eb2633..d2bc085c04 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -364,21 +364,19 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo ogg->curidx = idx; os->incomplete = 0; - if (!ogg->headers){ - int hdr = os->codec->header (s, idx); - os->header = os->seq; - if (!hdr){ + if (os->header) { + os->header = os->codec->header (s, idx); + if (!os->header){ os->segp = segp; os->psize = psize; + if (!ogg->headers) + s->data_offset = os->sync_pos; ogg->headers = 1; - s->data_offset = os->sync_pos; }else{ os->pstart += os->psize; os->psize = 0; } - } - - if (os->header > -1 && os->seq > os->header){ + } else { os->pflags = 0; os->pduration = 0; if (os->codec && os->codec->packet) @@ -405,7 +403,6 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo break; } - os->seq++; if (os->segp == os->nsegs) ogg->curidx = -1; -- cgit v1.2.3