summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-07-03 10:09:09 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-07-03 10:09:09 +0000
commita40429d6ce2325c9aea04810fdcf11e44e8b1f3d (patch)
tree19c0a036b1d3f95a005feeea9499bbc29dc5a04d /mplayer.c
parenteed786ceefc44a954a0a110537d4693331a27009 (diff)
downloadmpv-a40429d6ce2325c9aea04810fdcf11e44e8b1f3d.tar.bz2
mpv-a40429d6ce2325c9aea04810fdcf11e44e8b1f3d.tar.xz
Do not count skipped/broken frames when using -frames
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15896 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/mplayer.c b/mplayer.c
index 5e19a12515..a136314a0b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2240,11 +2240,6 @@ if(play_n_frames==0){
while(!eof){
float aq_sleep_time=0;
- if(play_n_frames>=0){
- --play_n_frames;
- if(play_n_frames<0) eof = PT_NEXT_ENTRY;
- }
-
/*========================== PLAY AUDIO ============================*/
while(sh_audio){
@@ -2521,6 +2516,11 @@ if(time_frame>0.001 && !(vo_flags&256)){
/* printf ("PANIC: too slow frame (%.3f)!\n", j); */
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;
tt = t2*0.000001f;