mirror of
https://github.com/mpv-player/mpv
synced 2024-10-30 04:46:41 +01:00
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
This commit is contained in:
parent
642b810fb1
commit
b43ef64f69
@ -644,12 +644,11 @@ if (demuxer->audio->id >= -1){
|
|||||||
priv->audio_codec = VIVO_AUDIO_SIREN;
|
priv->audio_codec = VIVO_AUDIO_SIREN;
|
||||||
}
|
}
|
||||||
|
|
||||||
sh->format = -1;
|
|
||||||
if (priv->audio_codec == VIVO_AUDIO_G723)
|
if (priv->audio_codec == VIVO_AUDIO_G723)
|
||||||
sh->format = 0x111;
|
sh->format = 0x111;
|
||||||
if (priv->audio_codec == VIVO_AUDIO_SIREN)
|
else if (priv->audio_codec == VIVO_AUDIO_SIREN)
|
||||||
sh->format = 0x112;
|
sh->format = 0x112;
|
||||||
if (sh->format == -1)
|
else
|
||||||
{
|
{
|
||||||
mp_msg(MSGT_DEMUX, MSGL_ERR, "VIVO: Not support audio codec (%d)\n",
|
mp_msg(MSGT_DEMUX, MSGL_ERR, "VIVO: Not support audio codec (%d)\n",
|
||||||
priv->audio_codec);
|
priv->audio_codec);
|
||||||
@ -714,7 +713,7 @@ if (demuxer->audio->id >= -1){
|
|||||||
sh->ds=demuxer->audio;
|
sh->ds=demuxer->audio;
|
||||||
demuxer->audio->id=1;
|
demuxer->audio->id=1;
|
||||||
nosound:
|
nosound:
|
||||||
;
|
free_sh_audio(sh);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user