comparison mplayer.c @ 22338:434cd072b0d3

Seek to -ss position without first starting audio/video from the start. Manual seeks no longer shift -endpos position (hopefully no one considered that a "feature").

22337:d79bd226342d

if(play_n_frames==0){
  mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
}

while(!mpctx->eof){
    float aq_sleep_time=0;
if(!mpctx->sh_audio && mpctx->d_audio->sh) {
  mpctx->sh_audio = mpctx->d_audio->sh;
  mpctx->sh_audio->ds = mpctx->d_audio;

      if (brk_cmd == 2)
	  goto goto_enable_cache;
  }
}
  mpctx->was_paused = 0;

  if (seek_to_sec) {
      rel_seek_secs += seek_to_sec;
      seek_to_sec = 0;
  }
  
  if (end_at.type != END_AT_NONE) {
    if(end_at.type == END_AT_SIZE) {
      mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
      end_at.type = END_AT_NONE;
    } else {
      end_at.pos += rel_seek_secs;
    }
  }

  /* Looping. */
  if(mpctx->eof==1 && loop_times>=0) {
    int l = loop_times;
    play_tree_iter_step(mpctx->playtree_iter,0,0);

22338:434cd072b0d3

if(play_n_frames==0){
  mpctx->eof=PT_NEXT_ENTRY; goto goto_next_file;
}

if (seek_to_sec) {
    seek(mpctx, seek_to_sec, 1);
    end_at.pos += seek_to_sec;
}

if (end_at.type == END_AT_SIZE) {
    mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased);
    end_at.type = END_AT_NONE;
}


while(!mpctx->eof){
    float aq_sleep_time=0;
if(!mpctx->sh_audio && mpctx->d_audio->sh) {
  mpctx->sh_audio = mpctx->d_audio->sh;
  mpctx->sh_audio->ds = mpctx->d_audio;

      if (brk_cmd == 2)
	  goto goto_enable_cache;
  }
}
  mpctx->was_paused = 0;

  /* Looping. */
  if(mpctx->eof==1 && loop_times>=0) {
    int l = loop_times;
    play_tree_iter_step(mpctx->playtree_iter,0,0);