diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-07 01:31:44 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-07 01:31:44 +0000 |
| commit | 572a39455ef8eeef47bf640488ed963ae55925e0 (patch) | |
| tree | 3bca377515b7a7381b84a238bd6d3d2374558592 /src/xine-engine/xine.c | |
| parent | a3801dae20515db5ba2da755a99b5470df9e8c5d (diff) | |
| download | xine-lib-572a39455ef8eeef47bf640488ed963ae55925e0.tar.gz xine-lib-572a39455ef8eeef47bf640488ed963ae55925e0.tar.bz2 | |
Add new mrl_t **get_dir functionality. Fix crash if audio driver == NULL.
CVS patchset: 67
CVS date: 2001/05/07 01:31:44
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index e8179b5ad..06586e223 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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: xine.c,v 1.14 2001/05/03 23:26:42 f1rmb Exp $ + * $Id: xine.c,v 1.15 2001/05/07 01:31:44 f1rmb Exp $ * * top-level xine functions * @@ -437,9 +437,14 @@ xine_t *xine_init (vo_driver_t *vo, this->video_out = vo_new_instance (vo, this->metronom); video_decoder_init (this); - this->audio_out = ao; - this->audio_out->connect (this->audio_out, this->metronom); - audio_decoder_init (this); + if(ao) { + this->audio_out = ao; + this->audio_out->connect (this->audio_out, this->metronom); + audio_decoder_init (this); + } + else + this->audio_out = NULL; /* Disabling audio output */ + /* * init SPU decoder |