summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2003-02-17 15:07:53 +0000
committerMike Melanson <mike@multimedia.cx>2003-02-17 15:07:53 +0000
commit6c5a65abeb5735a8c7aeac7ae2a9cde326dec45d (patch)
tree4a29dd223aff1dc958c071a62468445ce8f5b1ac
parenteba8e15659a34357921e3b47b4f9c73b1e953ee2 (diff)
downloadxine-lib-6c5a65abeb5735a8c7aeac7ae2a9cde326dec45d.tar.gz
xine-lib-6c5a65abeb5735a8c7aeac7ae2a9cde326dec45d.tar.bz2
playable even with NULL audio output
CVS patchset: 4183 CVS date: 2003/02/17 15:07:53
-rw-r--r--src/demuxers/demux_qt.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 26bfd0537..c2549daf8 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
* build_frame_table
* free_qt_info
*
- * $Id: demux_qt.c,v 1.145 2003/02/16 16:49:39 tmmm Exp $
+ * $Id: demux_qt.c,v 1.146 2003/02/17 15:07:53 tmmm Exp $
*
*/
@@ -1726,7 +1726,7 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) {
/* Decide the trak from which to dispatch a frame. Policy: Dispatch
* the frames in offset order as much as possible. If the pts difference
- * between the current frames from the audio and video tables is too
+ * between the current frames from the audio and video traks is too
* wide, make an exception. This exception deals with non-interleaved
* Quicktime files. */
if (!audio_trak && !video_trak) {
@@ -1867,6 +1867,11 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) {
} else {
/* load an audio sample and packetize it */
i = audio_trak->current_frame++;
+
+ /* only go through with this procedure if audio_fifo exists */
+ if (!this->audio_fifo)
+ return this->status;
+
remaining_sample_bytes = audio_trak->frames[i].size;
this->input->seek(this->input, audio_trak->frames[i].offset,
SEEK_SET);