diff options
| -rw-r--r-- | src/demuxers/demux_avi.c | 5 | ||||
| -rw-r--r-- | src/demuxers/demux_elem.c | 5 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 5 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 5 | ||||
| -rw-r--r-- | src/demuxers/demux_mpgaudio.c | 5 |
5 files changed, 15 insertions, 10 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 30294f434..9920060ed 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.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_avi.c,v 1.19 2001/06/16 18:03:22 guenter Exp $ + * $Id: demux_avi.c,v 1.20 2001/06/17 00:23:34 guenter Exp $ * * demultiplexer for avi streams * @@ -866,7 +866,8 @@ static void demux_avi_stop (demux_plugin_t *this_gen) { this->avi = NULL; this->video_fifo->clear(this->video_fifo); - this->audio_fifo->clear(this->audio_fifo); + if (this->audio_fifo) + this->audio_fifo->clear(this->audio_fifo); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_CONTROL_END; diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 5c2b58487..95182eebb 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.10 2001/06/16 18:03:22 guenter Exp $ + * $Id: demux_elem.c,v 1.11 2001/06/17 00:23:34 guenter Exp $ * * demultiplexer for elementary mpeg streams * @@ -136,7 +136,8 @@ static void demux_mpeg_elem_stop (demux_plugin_t *this_gen) { pthread_join (this->thread, &p); this->video_fifo->clear(this->video_fifo); - this->audio_fifo->clear(this->audio_fifo); + if (this->audio_fifo) + this->audio_fifo->clear(this->audio_fifo); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_CONTROL_END; diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index b80c8f7ca..30610e5da 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.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_mpeg.c,v 1.19 2001/06/16 18:03:22 guenter Exp $ + * $Id: demux_mpeg.c,v 1.20 2001/06/17 00:23:34 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -557,7 +557,8 @@ static void demux_mpeg_stop (demux_plugin_t *this_gen) { pthread_join (this->thread, &p); this->video_fifo->clear(this->video_fifo); - this->audio_fifo->clear(this->audio_fifo); + if(this->audio_fifo) + this->audio_fifo->clear(this->audio_fifo); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_CONTROL_END; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index b90949820..9105444be 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.16 2001/06/16 18:03:22 guenter Exp $ + * $Id: demux_mpeg_block.c,v 1.17 2001/06/17 00:23:34 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -387,7 +387,8 @@ static void demux_mpeg_block_stop (demux_plugin_t *this_gen) { pthread_join (this->thread, &p); this->video_fifo->clear(this->video_fifo); - this->audio_fifo->clear(this->audio_fifo); + if (this->audio_fifo) + this->audio_fifo->clear(this->audio_fifo); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_CONTROL_END; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 550ffee7d..bb0a329f5 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.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_mpgaudio.c,v 1.12 2001/06/16 18:03:22 guenter Exp $ + * $Id: demux_mpgaudio.c,v 1.13 2001/06/17 00:23:34 guenter Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -149,7 +149,8 @@ static void demux_mpgaudio_stop (demux_plugin_t *this_gen) { pthread_join (this->thread, &p); this->video_fifo->clear(this->video_fifo); - this->audio_fifo->clear(this->audio_fifo); + if (this->audio_fifo) + this->audio_fifo->clear(this->audio_fifo); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_CONTROL_END; |