mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
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
This commit is contained in:
parent
8730fad595
commit
81b743eb10
@ -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;
|
||||
|
||||
|
@ -62,7 +62,6 @@ struct ogg_stream {
|
||||
unsigned int pflags;
|
||||
unsigned int pduration;
|
||||
uint32_t serial;
|
||||
uint32_t seq;
|
||||
uint64_t granule;
|
||||
int64_t lastpts;
|
||||
int64_t lastdts;
|
||||
|
Loading…
x
Reference in New Issue
Block a user