aboutsummaryrefslogtreecommitdiffhomepage
path: root/libmpdemux
diff options
context:
space:
mode:
authorGravatar alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-21 11:18:54 +0000
committerGravatar alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-21 11:18:54 +0000
commitb43ef64f693de320418063143b7a50900b3ea5cc (patch)
tree7fef5f8f9c1fbcbc8992fb5f7f426d52b298d948 /libmpdemux
parent642b810fb1ec9c620dec7b0310491912f68cde37 (diff)
fixed 2 10l-s (bug found in the spring cleanup patch by Raindel Shachar
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9956 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_viv.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index 1d560451d8..7e73ed1f4a 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -644,12 +644,11 @@ if (demuxer->audio->id >= -1){
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 @@ if (demuxer->audio->id >= -1){
sh->ds=demuxer->audio;
demuxer->audio->id=1;
nosound:
- ;
+ free_sh_audio(sh);
}
}