Mercurial > mplayer.hg
changeset 20897:b85131ecee3d
Move -frames check out of frame flip code (like -endpos earlier)
author | uau |
---|---|
date | Tue, 14 Nov 2006 06:49:37 +0000 |
parents | 52811235ee24 |
children | 7c5be93b619b |
files | mplayer.c |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mplayer.c Tue Nov 14 06:44:16 2006 +0000 +++ b/mplayer.c Tue Nov 14 06:49:37 2006 +0000 @@ -4460,10 +4460,6 @@ double tt; if(vo_config_count) video_out->flip_page(); - if (play_n_frames >= 0) { - --play_n_frames; - if (play_n_frames <= 0) eof = PT_NEXT_ENTRY; - } // usec_sleep(50000); // test only! t2=GetTimer()-t2; @@ -4495,6 +4491,12 @@ set_video_quality(sh_video,output_quality); } + if (play_n_frames >= 0 && !frame_time_remaining && blit_frame) { + --play_n_frames; + if (play_n_frames <= 0) eof = PT_NEXT_ENTRY; + } + + // FIXME: add size based support for -endpos if (end_at.type == END_AT_TIME && !frame_time_remaining && end_at.pos <= sh_video->pts)