From d7bf1f31fabdb74427240a10c29706055fe9e34a Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 16 Apr 2007 22:12:46 +0100 Subject: Update build-deps; lose some versioning, but require etch (or equivalent). --- debian/changelog | 6 ++++++ debian/control | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3fcde9a3..178f0341a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xine-lib (1.1.6~hg-0) unstable; urgency=low + + * Hg snapshot. + + -- Darren Salt Mon, 16 Apr 2007 22:00:07 +0100 + xine-lib (1.1.5~cvs-0) unstable; urgency=low * CVS snapshot. diff --git a/debian/control b/debian/control index 1749dd041..c01e82fa5 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,19 @@ Section: libs Priority: optional Maintainer: Siggi Langauf Uploaders: Philipp Matthias Hahn , Reinhard Tartler -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 -- cgit v1.2.3 From 931ca6f5fea6b53dee5bf3131dc0e46199425038 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 17 Apr 2007 03:50:16 +0100 Subject: Fix DVD playback (was hanging when either the AC3 or DTS demuxers were probed). This may have side-effects wrt other streams; CDDA is fine, though. --- src/demuxers/demux_ac3.c | 2 +- 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, -- cgit v1.2.3