generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oggdec: Pass packets to header() until the stream is done with them

Browse Source 
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
This commit is contained in:
David Conrad 2010-03-12 05:17:01 +00:00
parent 8730fad595
commit 81b743eb10
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/oggdec.c
View File

@ -364,21 +364,19 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo
ogg->curidx = idx; ogg->curidx = idx;
os->incomplete = 0; os->incomplete = 0;
if (!ogg->headers){ if (os->header) {
int hdr = os->codec->header (s, idx); os->header = os->codec->header (s, idx);
os->header = os->seq; if (!os->header){
if (!hdr){
os->segp = segp; os->segp = segp;
os->psize = psize; os->psize = psize;
if (!ogg->headers)
s->data_offset = os->sync_pos;
ogg->headers = 1; ogg->headers = 1;
s->data_offset = os->sync_pos;
}else{ }else{
os->pstart += os->psize; os->pstart += os->psize;
os->psize = 0; os->psize = 0;
} }
} } else {
if (os->header > -1 && os->seq > os->header){
os->pflags = 0; os->pflags = 0;
os->pduration = 0; os->pduration = 0;
if (os->codec && os->codec->packet) if (os->codec && os->codec->packet)
@ -405,7 +403,6 @@ ogg_packet (AVFormatContext * s, int *str, int *dstart, int *dsize, int64_t *fpo
break; break;
} }
os->seq++;
if (os->segp == os->nsegs) if (os->segp == os->nsegs)
ogg->curidx = -1; ogg->curidx = -1;

1
libavformat/oggdec.h
View File

@ -62,7 +62,6 @@ struct ogg_stream {
unsigned int pflags; unsigned int pflags;
unsigned int pduration; unsigned int pduration;
uint32_t serial; uint32_t serial;
uint32_t seq;
uint64_t granule; uint64_t granule;
int64_t lastpts; int64_t lastpts;
int64_t lastdts; int64_t lastdts;