diff options
author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 06:49:37 +0000 |
---|---|---|
committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-14 06:49:37 +0000 |
commit | c29775e9019aaf2f3d17c2f997e133bdd8a1c465 (patch) | |
tree | b99256f1266af5faaeee5a84a8e5aca2b19cd149 | |
parent | 7181a091f819eb19e9b0b811a3c4d74d9c41d516 (diff) | |
download | mpv-c29775e9019aaf2f3d17c2f997e133bdd8a1c465.tar.bz2 mpv-c29775e9019aaf2f3d17c2f997e133bdd8a1c465.tar.xz |
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
-rw-r--r-- | mplayer.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -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) |