diff options
author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-28 12:08:20 +0000 |
---|---|---|
committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-28 12:08:20 +0000 |
commit | 00eefe1016adb7d586a3cf79f015afc6e367f920 (patch) | |
tree | eec831f95eeddb8d8d1ca5f1a0b2410cb8a0be3f /src/demuxers/demux_elem.c | |
parent | a94dd5082488feb9248044f122dec8da9bc90d1a (diff) | |
download | xine-lib-00eefe1016adb7d586a3cf79f015afc6e367f920.tar.gz xine-lib-00eefe1016adb7d586a3cf79f015afc6e367f920.tar.bz2 |
Ability to playback streams without loaded audio driver.
CVS patchset: 89
CVS date: 2001/05/28 12:08:20
Diffstat (limited to 'src/demuxers/demux_elem.c')
-rw-r--r-- | src/demuxers/demux_elem.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index f64dd4b0f..265ba20e5 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_elem.c,v 1.7 2001/05/28 01:28:10 f1rmb Exp $ + * $Id: demux_elem.c,v 1.8 2001/05/28 12:08:20 f1rmb Exp $ * * demultiplexer for elementary mpeg streams * @@ -85,7 +85,7 @@ static int demux_mpeg_elem_next (demux_mpeg_elem_t *this) { * */ static void *demux_mpeg_elem_loop (void *this_gen) { - buf_element_t *buf; + buf_element_t *buf = NULL; demux_mpeg_elem_t *this = (demux_mpeg_elem_t *) this_gen; do { @@ -103,9 +103,11 @@ static void *demux_mpeg_elem_loop (void *this_gen) { buf->type = BUF_CONTROL_END; this->video_fifo->put (this->video_fifo, buf); - buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); - buf->type = BUF_CONTROL_END; - this->audio_fifo->put (this->audio_fifo, buf); + if(this->audio_fifo) { + buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); + buf->type = BUF_CONTROL_END; + this->audio_fifo->put (this->audio_fifo, buf); + } pthread_exit(NULL); } @@ -158,10 +160,11 @@ static void demux_mpeg_elem_start (demux_plugin_t *this_gen, buf->type = BUF_CONTROL_START; this->video_fifo->put (this->video_fifo, buf); - buf = this->audio_fifo->buffer_pool_alloc (this->video_fifo); - buf->type = BUF_CONTROL_START; - this->audio_fifo->put (this->audio_fifo, buf); - + if(this->audio_fifo) { + buf = this->audio_fifo->buffer_pool_alloc (this->video_fifo); + buf->type = BUF_CONTROL_START; + this->audio_fifo->put (this->audio_fifo, buf); + } /* * now start demuxing */ |