diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-17 16:53:33 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-04-17 16:53:33 +0100 |
| commit | 0bbc4497a72dca89f178349b76fca6ea92bbf17f (patch) | |
| tree | 03b7528f8507c2f86beed9f9a9e6149ceaa27f23 /src | |
| parent | 7604f551c91343371d13cd10fd66ab8c09208ff6 (diff) | |
| parent | 931ca6f5fea6b53dee5bf3131dc0e46199425038 (diff) | |
| download | xine-lib-0bbc4497a72dca89f178349b76fca6ea92bbf17f.tar.gz xine-lib-0bbc4497a72dca89f178349b76fca6ea92bbf17f.tar.bz2 | |
Merge from 1.1 (and update the debian/changelog datestamp for 1.2.0~hg).
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_ac3.c | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_dts.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 73313ee12..279da6336 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -135,7 +135,7 @@ static int open_ac3_file(demux_ac3_t *this) { uint8_t *peak; blocksize = this->input->get_blocksize(this->input); - if (blocksize) { + if (blocksize && INPUT_IS_SEEKABLE(this->input)) { this->input->seek(this->input, 0, SEEK_SET); buf_element_t *buf = this->input->read_block(this->input, this->stream->audio_fifo, diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index a5beba7dd..a9541b6f7 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -85,7 +85,7 @@ static int open_dts_file(demux_dts_t *this) { lprintf("open_dts_file\n"); blocksize = this->input->get_blocksize(this->input); - if (blocksize) { + if (blocksize && INPUT_IS_SEEKABLE(this->input)) { // this->input->seek(this->input, 0, SEEK_SET); buf_element_t *buf = this->input->read_block(this->input, this->stream->audio_fifo, |