summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2004-12-25 17:52:10 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2004-12-25 17:52:10 +0000
commitc2e817d4ed02e1e184ce7f2e64c51ac2cc3d63bd (patch)
tree55d13db62f6b5693dd4f9efceb2940a97f52b6ed /src
parent754447c701db3c2d2e24c9841be720414b5c125c (diff)
downloadxine-lib-c2e817d4ed02e1e184ce7f2e64c51ac2cc3d63bd.tar.gz
xine-lib-c2e817d4ed02e1e184ce7f2e64c51ac2cc3d63bd.tar.bz2
fix segfault with 'none' audio plugin.
CVS patchset: 7301 CVS date: 2004/12/25 17:52:10
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_avi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 9f3e34490..601307595 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.213 2004/12/24 17:43:36 hadess Exp $
+ * $Id: demux_avi.c,v 1.214 2004/12/25 17:52:10 f1rmb Exp $
*
* demultiplexer for avi streams
*
@@ -1923,8 +1923,9 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1);
_x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, !this->no_audio);
_x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, _x_buf_video_name(this->avi->video_type));
- if (!this->no_audio)
- _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, _x_buf_audio_name(this->avi->audio[0]->audio_type));
+
+ if (this->avi->audio[0] && !this->no_audio)
+ _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, _x_buf_audio_name(this->avi->audio[0]->audio_type));
/*
* send start/header buffers