diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-04-10 09:26:43 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-04-15 11:45:03 +0200 |
| commit | 8f3eebd663b4d775b001a6924eec3efdc473821d (patch) | |
| tree | 6e35214fd2d6b89f5cc5da49ebec7c3c3827df2f | |
| parent | f668afd4896ee65683619b6f165dda4cdd46766f (diff) | |
| download | ffmpeg-8f3eebd663b4d775b001a6924eec3efdc473821d.tar.gz | |
oggdec: simplify audio chained ogg streams support
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavformat/oggdec.c | 8 | ||||
| -rw-r--r-- | libavformat/oggdec.h | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 5cf4faa686..ce1152d3c2 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -164,7 +164,6 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial) os->bufsize = DECODER_BUFFER_SIZE; os->buf = av_malloc(os->bufsize); os->header = -1; - os->page_begin = 1; st = av_new_stream (s, idx); if (!st) @@ -242,8 +241,7 @@ 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].page_begin) { + if (ogg->headers) { int n; for (n = 0; n < ogg->nstreams; n++) { @@ -252,8 +250,6 @@ ogg_read_page (AVFormatContext * s, int *str) } ogg->curidx = -1; ogg->nstreams = 0; - break; - } } idx = ogg_new_stream (s, serial); if (idx < 0) @@ -261,8 +257,6 @@ ogg_read_page (AVFormatContext * s, int *str) } os = ogg->streams + idx; - if (!(flags & OGG_FLAG_BOS)) - os->page_begin = 0; os->page_pos = avio_tell(bc) - 27; if(os->psize > 0) diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 785cd812f9..7d66cd5638 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -75,7 +75,6 @@ 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 page_begin; ///< set to 1 if the stream only received a begin-of-stream packet, otherwise 0 void *private; }; |