# HG changeset patch # User uau # Date 1163486977 0 # Node ID b85131ecee3d3b0edb51170860b78211cefe3f8d # Parent 52811235ee246911f18ce49120cbbd655b65c241 Move -frames check out of frame flip code (like -endpos earlier) diff -r 52811235ee24 -r b85131ecee3d mplayer.c --- 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)