From: Darren S. <li...@yo...> - 2007-04-17 00:11:33
|
I demand that Manfred Tremmel may or may not have written... > Am Sonntag, 15. April 2007 14:33 schrieb Darren Salt: >> Changeset 16e2e0741d34. There was a null pointer being passed to the >> input plugin; the DTS demuxer was present in the backtrace. >> http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=16e2e0741d34d2b8b47a835076aa1c15637d4964;style=gitweb > Is it possible, this patch breaks Video-DVD-playback? xine-ui and kaffeine > freezes now when trying to playback a Video-DVD. Without this patch it > works. This was reported on #xine yesterday, and a bisection showed that the cause is this patch. About the only idea that I have (which doesn't remove the patch which caused the CDDA crashes) is to use this->audio_fifo unless it's NULL, e.g. (untested) diff -r 769f13813a07 src/demuxers/demux_ac3.c --- a/src/demuxers/demux_ac3.c Mon Apr 16 22:12:46 2007 +0100 +++ b/src/demuxers/demux_ac3.c Tue Apr 17 01:06:30 2007 +0100 @@ -138,7 +138,7 @@ static int open_ac3_file(demux_ac3_t *th if (blocksize) { this->input->seek(this->input, 0, SEEK_SET); buf_element_t *buf = this->input->read_block(this->input, - this->stream->audio_fifo, + this->audio_fifo ? : this->stream->audio_fifo, blocksize); this->input->seek(this->input, 0, SEEK_SET); diff -r 769f13813a07 src/demuxers/demux_dts.c --- a/src/demuxers/demux_dts.c Mon Apr 16 22:12:46 2007 +0100 +++ b/src/demuxers/demux_dts.c Tue Apr 17 01:06:29 2007 +0100 @@ -88,7 +88,7 @@ static int open_dts_file(demux_dts_t *th if (blocksize) { // this->input->seek(this->input, 0, SEEK_SET); buf_element_t *buf = this->input->read_block(this->input, - this->stream->audio_fifo, + this->audio_fifo ? : this->stream->audio_fifo, blocksize); this->input->seek(this->input, 0, SEEK_SET); If you object to the GCC extension in use in this diff, just shout :-) -- | Darren Salt | linux or ds at | nr. Ashington, | Toon | RISC OS, Linux | youmustbejoking,demon,co,uk | Northumberland | Army | + Use more efficient products. Use less. BE MORE ENERGY EFFICIENT. Never throw a bird at a dragon. |