[Mplayer-cvslog] CVS: main/libmpdemux demux_viv.c,1.24,1.25

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv31550

Modified Files:
	demux_viv.c 
Log Message:
fixed 2 10l-s (bug found in the spring cleanup patch by Raindel Shachar

Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- demux_viv.c	23 Nov 2002 10:58:08 -0000	1.24
+++ demux_viv.c	21 Apr 2003 11:18:54 -0000	1.25
@@ -644,12 +644,11 @@
 			priv->audio_codec = VIVO_AUDIO_SIREN;
 		}
 
-		sh->format = -1;
 		if (priv->audio_codec == VIVO_AUDIO_G723)
 		    sh->format = 0x111;
-		if (priv->audio_codec == VIVO_AUDIO_SIREN)
+		else if (priv->audio_codec == VIVO_AUDIO_SIREN)
 		    sh->format = 0x112;
-		if (sh->format == -1)
+		else
 		{
 		    mp_msg(MSGT_DEMUX, MSGL_ERR, "VIVO: Not support audio codec (%d)\n",
 			priv->audio_codec);
@@ -714,7 +713,7 @@
 		sh->ds=demuxer->audio;
 		demuxer->audio->id=1;
 nosound:
-		;
+		free_sh_audio(sh);
 }
 }