Mercurial > mplayer.hg

changeset 9955:d6be831a5f9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed 2 10l-s (bug found in the spring cleanup patch by Raindel Shachar
author alex
date Mon, 21 Apr 2003 11:18:54 +0000
parents 2615897d001d
children ee365a7ed11d
files libmpdemux/demux_viv.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_viv.c	Mon Apr 21 07:53:55 2003 +0000
+++ b/libmpdemux/demux_viv.c	Mon Apr 21 11:18:54 2003 +0000
@@ -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);
 }
 }