From c29775e9019aaf2f3d17c2f997e133bdd8a1c465 Mon Sep 17 00:00:00 2001 From: uau Date: Tue, 14 Nov 2006 06:49:37 +0000 Subject: [PATCH] Move -frames check out of frame flip code (like -endpos earlier) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20913 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mplayer.c b/mplayer.c index 15169be360..fe1843fe3d 100644 --- a/mplayer.c +++ b/mplayer.c @@ -4460,10 +4460,6 @@ if(time_frame>0.001 && !(vo_flags&256)) 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 @@ if(auto_quality>0){ 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)