diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-21 20:48:41 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-10-21 20:48:41 +0000 |
commit | 3b248ecf2461776561c87757f12d54e3bccd14f3 (patch) | |
tree | cb6a3aeb5b36112b311f92d8dfe4aab1e0160e25 /libmpdemux | |
parent | ff42625d83f07c4ebfa4f484c8d6f8dbdc4a654e (diff) | |
download | mpv-3b248ecf2461776561c87757f12d54e3bccd14f3.tar.bz2 mpv-3b248ecf2461776561c87757f12d54e3bccd14f3.tar.xz |
Avoid crash after "AVI: No audio stream found -> no sound." message,
audio was not correctly disabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20343 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_avi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 115102f639..797d545fca 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -470,7 +470,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ } if(a_pos==-1){ mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI_NI: " MSGTR_MissingAudioStream); - sh_audio=NULL; + d_audio->sh=sh_audio=NULL; } else { if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB mp_msg(MSGT_DEMUX,MSGL_INFO,MSGTR_NI_Message,force_ni?MSGTR_NI_Forced:MSGTR_NI_Detected); @@ -500,7 +500,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id); if(!priv->audio_streams || !ds_fill_buffer(d_audio)){ mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI: " MSGTR_MissingAudioStream); - sh_audio=NULL; + d_audio->sh=sh_audio=NULL; } else { sh_audio=d_audio->sh;sh_audio->ds=d_audio; sh_audio->format=sh_audio->wf->wFormatTag; |