summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Zuehlke <andruil@users.sourceforge.net>2004-01-29 12:59:11 +0000
committerMarco Zuehlke <andruil@users.sourceforge.net>2004-01-29 12:59:11 +0000
commit77c5691b7407afd96e2aaac85cccb59e1850ad90 (patch)
treebacb376fb6d3fb4049a8ad37a34caf0463a7409c
parent8cb9979f6da66c7b424ece5f6b03aa0f1d816855 (diff)
downloadxine-lib-77c5691b7407afd96e2aaac85cccb59e1850ad90.tar.gz
xine-lib-77c5691b7407afd96e2aaac85cccb59e1850ad90.tar.bz2
don't send comment packets to the video decoder
CVS patchset: 6080 CVS date: 2004/01/29 12:59:11
-rw-r--r--src/demuxers/demux_ogg.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index d2facbcf4..b6eae3087 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_ogg.c,v 1.137 2004/01/23 09:25:24 andruil Exp $
+ * $Id: demux_ogg.c,v 1.138 2004/01/29 12:59:11 andruil Exp $
*
* demultiplexer for ogg streams
*
@@ -654,31 +654,31 @@ static void send_ogg_buf (demux_ogg_t *this,
if (op->packet[0] == PACKET_TYPE_COMMENT ) {
read_chapter_comment(this, op);
- }
-
- data = op->packet+1+hdrlen;
- size = op->bytes-1-hdrlen;
-
- if ((op->granulepos != -1) || (this->si[stream_num]->header_granulepos != -1)) {
- pts = get_pts(this, stream_num, op->granulepos );
- check_newpts( this, pts, PTS_VIDEO, decoder_flags );
- } else
- pts = 0;
-
- lprintf ("videostream %d op-gpos %lld hdr-gpos %lld pts %lld \n",
- stream_num,
- op->granulepos,
- this->si[stream_num]->header_granulepos,
- pts);
-
- _x_demux_send_data(this->video_fifo, data, size,
- pts, this->si[stream_num]->buf_types, decoder_flags,
- this->input->get_current_pos(this->input),
- this->input->get_length(this->input),
- pts / 90, this->time_length, 0);
+ }else{
+ data = op->packet+1+hdrlen;
+ size = op->bytes-1-hdrlen;
- if (this->chapter_info && op->granulepos != -1) {
- update_chapter_display(this, stream_num, op);
+ if ((op->granulepos != -1) || (this->si[stream_num]->header_granulepos != -1)) {
+ pts = get_pts(this, stream_num, op->granulepos );
+ check_newpts( this, pts, PTS_VIDEO, decoder_flags );
+ } else
+ pts = 0;
+
+ lprintf ("videostream %d op-gpos %lld hdr-gpos %lld pts %lld \n",
+ stream_num,
+ op->granulepos,
+ this->si[stream_num]->header_granulepos,
+ pts);
+
+ _x_demux_send_data(this->video_fifo, data, size,
+ pts, this->si[stream_num]->buf_types, decoder_flags,
+ this->input->get_current_pos(this->input),
+ this->input->get_length(this->input),
+ pts / 90, this->time_length, 0);
+
+ if (this->chapter_info && op->granulepos != -1) {
+ update_chapter_display(this, stream_num, op);
+ }
}
} else if ((this->si[stream_num]->buf_types & 0xFF000000) == BUF_SPU_BASE) {