summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/control10
-rw-r--r--src/demuxers/demux_ac3.c2
-rw-r--r--src/demuxers/demux_dts.c2
4 files changed, 14 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index b2d25a3ce..640044a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,13 @@ xine-lib (1.2.0~hg-0) unstable; urgency=low
* Hg snapshot.
* Adjust for libxine2.
- -- Darren Salt <linux@youmustbejoking.demon.co.uk> Sat, 14 Apr 2007 16:31:58 +0100
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Tue, 17 Apr 2007 16:50:37 +0100
+
+xine-lib (1.1.6~hg-0) unstable; urgency=low
+
+ * Hg snapshot.
+
+ -- Darren Salt <linux@youmustbejoking.demon.co.uk> Mon, 16 Apr 2007 22:00:07 +0100
xine-lib (1.1.5~cvs-0) unstable; urgency=low
diff --git a/debian/control b/debian/control
index fa053d851..fc7bf047c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,19 @@ Section: libs
Priority: optional
Maintainer: Siggi Langauf <siggi@debian.org>
Uploaders: Philipp Matthias Hahn <pmhahn@debian.org>, Reinhard Tartler <siretart@tauware.de>
-Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), pkg-config,
+Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
automake1.9, autoconf, libtool,
libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev,
libdirectfb-dev (>= 0.9.22),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libaa1-dev, libcaca-dev (>= 0.99.beta4-1), libmodplug-dev,
+ libaa1-dev, libcaca-dev, libmodplug-dev,
libmagick9-dev, libpng12-dev, libfreetype6-dev,
libogg-dev, libvorbis-dev, libtheora-dev,
libesd0-dev, libgnomevfs2-dev,
- zlib1g-dev, libartsc0-dev (>>1.1.0),
- liblircclient-dev,
+ zlib1g-dev, libartsc0-dev,
+ liblircclient-dev, libjack0.100.0-dev,
libdirectfb-dev, libgtk2.0-dev,
- libflac-dev (>>1.1.0), libpulse-dev, libsdl1.2-dev (>=1.2.11),
+ libflac-dev, libpulse-dev, libsdl1.2-dev,
libsmbclient-dev, libspeex-dev, libmng-dev,
libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1),
w3m, transfig, gs, sgmltools-lite
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,