# HG changeset patch
# User nicodvb
# Date 1142166489 0
# Node ID 24fc4279bf99a51ebb4f42c7fb118e973c7d3666
# Parent  6be72b753b8277ba622ca3f6f442238c13784904
fail immediately if any of the parameters necessary to switch audio stream isn't set/correct; closes cid 55

diff -r 6be72b753b82 -r 24fc4279bf99 libmpdemux/demux_mpg.c
--- a/libmpdemux/demux_mpg.c	Sun Mar 12 12:13:37 2006 +0000
+++ b/libmpdemux/demux_mpg.c	Sun Mar 12 12:28:09 2006 +0000
@@ -816,11 +816,15 @@
 	    return DEMUXER_CTRL_DONTKNOW;
 
 	case DEMUXER_CTRL_SWITCH_AUDIO:
-            if (mpg_d && mpg_d->num_a_streams > 1 && demuxer->audio && demuxer->audio->sh) {
+            if(! (mpg_d && mpg_d->num_a_streams > 1 && demuxer->audio && demuxer->audio->sh))
+	      return DEMUXER_CTRL_NOTIMPL; 
+	    else {
               demux_stream_t *d_audio = demuxer->audio;
               sh_audio_t *sh_audio = d_audio->sh;
               sh_audio_t *sh_a = sh_audio;
               int i;
+	      if(!sh_audio)
+	        return DEMUXER_CTRL_NOTIMPL;
               if (*((int*)arg) < 0)
               {
               for (i = 0; i < mpg_d->num_a_streams; i++) {