Mercurial > mplayer.hg

comparison libmpdemux/demux_avi.c @ 20337:fccb66884d60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid crash after "AVI: No audio stream found -> no sound." message, audio was not correctly disabled.
author reimar
date Sat, 21 Oct 2006 20:48:41 +0000
parents c25a7de1c47c
children f4518826ea84
comparison
equal deleted inserted replaced
20336:2796a2d0e8c8 20337:fccb66884d60
468 mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI_NI: " MSGTR_MissingVideoStream); 468 mp_msg(MSGT_DEMUX,MSGL_ERR,"AVI_NI: " MSGTR_MissingVideoStream);
469 return NULL; 469 return NULL;
470 } 470 }
471 if(a_pos==-1){ 471 if(a_pos==-1){
472 mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI_NI: " MSGTR_MissingAudioStream); 472 mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI_NI: " MSGTR_MissingAudioStream);
473 sh_audio=NULL; 473 d_audio->sh=sh_audio=NULL;
474 } else { 474 } else {
475 if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB 475 if(force_ni || abs(a_pos-v_pos)>0x100000){ // distance > 1MB
476 mp_msg(MSGT_DEMUX,MSGL_INFO,MSGTR_NI_Message,force_ni?MSGTR_NI_Forced:MSGTR_NI_Detected); 476 mp_msg(MSGT_DEMUX,MSGL_INFO,MSGTR_NI_Message,force_ni?MSGTR_NI_Forced:MSGTR_NI_Detected);
477 demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!! 477 demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
478 demuxer->desc=&demuxer_desc_avi_ni; // HACK!!!! 478 demuxer->desc=&demuxer_desc_avi_ni; // HACK!!!!
498 sh_video=d_video->sh;sh_video->ds=d_video; 498 sh_video=d_video->sh;sh_video->ds=d_video;
499 if(d_audio->id!=-2){ 499 if(d_audio->id!=-2){
500 mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id); 500 mp_msg(MSGT_DEMUX,MSGL_V,"AVI: Searching for audio stream (id:%d)\n",d_audio->id);
501 if(!priv->audio_streams || !ds_fill_buffer(d_audio)){ 501 if(!priv->audio_streams || !ds_fill_buffer(d_audio)){
502 mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI: " MSGTR_MissingAudioStream); 502 mp_msg(MSGT_DEMUX,MSGL_INFO,"AVI: " MSGTR_MissingAudioStream);
503 sh_audio=NULL; 503 d_audio->sh=sh_audio=NULL;
504 } else { 504 } else {
505 sh_audio=d_audio->sh;sh_audio->ds=d_audio; 505 sh_audio=d_audio->sh;sh_audio->ds=d_audio;
506 sh_audio->format=sh_audio->wf->wFormatTag; 506 sh_audio->format=sh_audio->wf->wFormatTag;
507 } 507 }
508 } 508 }