From 0c1724959f47b37d775073b854b29b0963645320 Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sun, 29 Oct 2006 22:02:10 +0000 Subject: [PATCH] a previous commit introduced a bug that prevented tables from being parsed in the feeding phase; removed useless debugs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20524 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 324458583c..a84707509c 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -2775,11 +2775,6 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, continue; } } - else - { - stream_skip(stream, buf_size+junk); - continue; - } //IS IT TIME TO QUEUE DATA to the dp_packet? if(is_start && (dp != NULL)) @@ -2788,7 +2783,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, } - if(*dp == NULL) + if(dp && *dp == NULL) { if(*buffer_size > MAX_PACK_BYTES) *buffer_size = MAX_PACK_BYTES; @@ -2801,8 +2796,6 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, } mp_msg(MSGT_DEMUX, MSGL_DBG2, "CREATED DP(%d)\n", *buffer_size); } - - mp_msg(MSGT_DEMUX, MSGL_DBG2, "NOW PACKET_SIZE = %d, DP_OFFSET = %d\n", *buffer_size, *dp_offset); } @@ -2868,6 +2861,9 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, } } + if(!probe && !dp) + continue; + if(is_start) { uint8_t *lang = NULL;