diff options
| -rw-r--r-- | src/demuxers/demux_ts.c | 8 | ||||
| -rw-r--r-- | src/input/input_plugin.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index c57fc34ef..f2da5f268 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -337,7 +337,6 @@ typedef struct { int32_t packet_number; /* NEW: var to keep track of number of last read packets */ int32_t npkt_read; - int32_t read_zero; uint8_t buf[BUF_SIZE]; /* == PKT_SIZE * NPKT_PER_READ */ @@ -1536,12 +1535,7 @@ static unsigned char * demux_synchronise(demux_ts_t* this) { */ if (this->npkt_read == 0) { - /* printf ("demux_ts: read 0 packets! (%d)\n", this->read_zero); */ - this->read_zero++; - } else this->read_zero = 0; - - if (this->read_zero > 200) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: read 0 packets too many times!\n"); + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: read 0 packets\n"); this->status = DEMUX_FINISHED; return NULL; } diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 370dc6a71..11e1303e7 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -115,6 +115,8 @@ struct input_plugin_s { /* * read nlen bytes, return number of bytes read + * Should block until some bytes available for read; + * a return value of 0 indicates no data available */ off_t (*read) (input_plugin_t *this, char *buf, off_t nlen); |