comparison mplayer.c @ 21031:e45bb0ee5558

Make sure sh_video == NULL when reinit_video_chain fails.

21030:1c6d131163b6

    //shouldn't we set dvideo->id=-2 when we fail?
    vo_config_count=0;
    //if((video_out->preinit(vo_subdevice))!=0){
    if(!(video_out=init_best_video_out(video_driver_list))){
      mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
      return 0;
    }
    sh_video->video_out=video_out;
    inited_flags|=INITED_VO;
  }

  init_best_video_codec(sh_video,video_codec_list,video_fm_list);
  mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");

  if(!sh_video->inited){
    if(!fixed_vo) uninit_player(INITED_VO);
    sh_video = d_video->sh = NULL;
    return 0;
  }

  inited_flags|=INITED_VCODEC;

  if (sh_video->codec)

  // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============

  current_module="init_vo";

  return 1;
}

int main(int argc,char* argv[]){

  mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(demuxer));

if(!sh_video) goto main; // audio-only

if(!reinit_video_chain()) {
  if(!sh_video || !sh_video->inited){
    if(!sh_audio) goto goto_next_file;
    goto main; // exit_player(MSGTR_Exit_error);
  }
}

21031:e45bb0ee5558

    //shouldn't we set dvideo->id=-2 when we fail?
    vo_config_count=0;
    //if((video_out->preinit(vo_subdevice))!=0){
    if(!(video_out=init_best_video_out(video_driver_list))){
      mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_ErrorInitializingVODevice);
      goto err_out;
    }
    sh_video->video_out=video_out;
    inited_flags|=INITED_VO;
  }

  init_best_video_codec(sh_video,video_codec_list,video_fm_list);
  mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");

  if(!sh_video->inited){
    if(!fixed_vo) uninit_player(INITED_VO);
    goto err_out;
  }

  inited_flags|=INITED_VCODEC;

  if (sh_video->codec)

  // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============

  current_module="init_vo";

  return 1;

err_out:
  sh_video = d_video->sh = NULL;
  return 0;
}

int main(int argc,char* argv[]){

  mp_msg(MSGT_IDENTIFY,MSGL_INFO,"ID_LENGTH=%.2lf\n", demuxer_get_time_length(demuxer));

if(!sh_video) goto main; // audio-only

if(!reinit_video_chain()) {
  if(!sh_video){
    if(!sh_audio) goto goto_next_file;
    goto main; // exit_player(MSGTR_Exit_error);
  }
}