diff options
-rw-r--r-- | player/playloop.c | 2 | ||||
-rw-r--r-- | player/video.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/player/playloop.c b/player/playloop.c index e8409e90b6..9f0fb58313 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -765,7 +765,7 @@ static void handle_sstep(struct MPContext *mpctx) if (mpctx->video_status >= STATUS_EOF) { if (mpctx->max_frames >= 0) - mpctx->stop_play = AT_END_OF_FILE; + mpctx->stop_play = AT_END_OF_FILE; // force EOF even if audio left if (mpctx->step_frames > 0 && !mpctx->paused) pause_player(mpctx); } diff --git a/player/video.c b/player/video.c index 431eb73d6e..77b6fb9a6d 100644 --- a/player/video.c +++ b/player/video.c @@ -596,7 +596,9 @@ static int video_output_image(struct MPContext *mpctx, double endpts) && mpctx->video_status == STATUS_SYNCING; if (hrseek && img->pts < mpctx->hrseek_pts - .005) drop = true; - if (endpts != MP_NOPTS_VALUE && img->pts >= endpts) { + if ((endpts != MP_NOPTS_VALUE && img->pts >= endpts) || + mpctx->max_frames == 0) + { drop = true; r = VD_EOF; } |