diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-16 03:55:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-16 03:55:48 +0200 |
| commit | d3b379b95b0da8e4d612a9a1987ba6fd8f2bd8bf (patch) | |
| tree | 116351b9bc5c9e91decd252a81ce4da7d3584f1d /libavformat/oggdec.c | |
| parent | f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b (diff) | |
| parent | 4d012eb541ed7f35e00c87035a470d9f0a24a6e8 (diff) | |
| download | ffmpeg-d3b379b95b0da8e4d612a9a1987ba6fd8f2bd8bf.tar.gz | |
Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8'
* commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8':
xwma: Fix wrong printf format expression.
xwma demuxer: typos
oggdec: simplify audio chained ogg streams support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.c')
| -rw-r--r-- | libavformat/oggdec.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 83ae9bdb0e..100519b93a 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) |