virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

oggdec: simplify audio chained ogg streams support

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Clément Bœsch 2011-04-10 09:26:43 +02:00 committed by Luca Barbato
parent f668afd489
commit 8f3eebd663
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/oggdec.c
View File

@ -164,7 +164,6 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial)
os->bufsize = DECODER_BUFFER_SIZE; os->bufsize = DECODER_BUFFER_SIZE;
os->buf = av_malloc(os->bufsize); os->buf = av_malloc(os->bufsize);
os->header = -1; os->header = -1;
os->page_begin = 1;
st = av_new_stream (s, idx); st = av_new_stream (s, idx);
if (!st) if (!st)
@ -242,8 +241,7 @@ ogg_read_page (AVFormatContext * s, int *str)
idx = ogg_find_stream (ogg, serial); idx = ogg_find_stream (ogg, serial);
if (idx < 0){ if (idx < 0){
for (i = 0; i < ogg->nstreams; i++) { if (ogg->headers) {
if (!ogg->streams[i].page_begin) {
int n; int n;
for (n = 0; n < ogg->nstreams; n++) { for (n = 0; n < ogg->nstreams; n++) {
@ -252,8 +250,6 @@ ogg_read_page (AVFormatContext * s, int *str)
} }
ogg->curidx = -1; ogg->curidx = -1;
ogg->nstreams = 0; ogg->nstreams = 0;
break;
}
} }
idx = ogg_new_stream (s, serial); idx = ogg_new_stream (s, serial);
if (idx < 0) if (idx < 0)
@ -261,8 +257,6 @@ ogg_read_page (AVFormatContext * s, int *str)
} }
os = ogg->streams + idx; os = ogg->streams + idx;
if (!(flags & OGG_FLAG_BOS))
os->page_begin = 0;
os->page_pos = avio_tell(bc) - 27; os->page_pos = avio_tell(bc) - 27;
if(os->psize > 0) if(os->psize > 0)

1
libavformat/oggdec.h
View File

@ -75,7 +75,6 @@ struct ogg_stream {
int incomplete; ///< whether we're expecting a continuation in the next page 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 page_end; ///< current packet is the last one completed in the page
int keyframe_seek; int keyframe_seek;
int page_begin; ///< set to 1 if the stream only received a begin-of-stream packet, otherwise 0
void *private; void *private;
}; };