From fc438061e865d9aeca686500b09339cbc330c66f Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 9 Jun 2013 16:37:13 +0200 Subject: encoding: fix -oneverdrop logic when -omaxfps is used Not that anyone should ever do this... --- video/out/vo_lavc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'video') diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 5a333a5799..c35b18d749 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -395,12 +395,15 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) } // never-drop mode - if (ectx->options->neverdrop && frameipts <= vc->lastipts) { + if (ectx->options->neverdrop) { int64_t step = vc->mindeltapts ? vc->mindeltapts : 1; - mp_msg(MSGT_ENCODE, MSGL_INFO, "vo-lavc: -oneverdrop increased pts by %d\n", - (int) (vc->lastipts - frameipts + step)); - frameipts = vc->lastipts + step; - vc->lastpts = frameipts * timeunit - encode_lavc_getoffset(ectx, vc->stream); + if (frameipts < vc->lastipts + step) { + mp_msg(MSGT_ENCODE, MSGL_INFO, + "vo-lavc: -oneverdrop increased pts by %d\n", + (int) (vc->lastipts - frameipts + step)); + frameipts = vc->lastipts + step; + vc->lastpts = frameipts * timeunit - encode_lavc_getoffset(ectx, vc->stream); + } } if (vc->lastipts != MP_NOPTS_VALUE) { -- cgit v1.2.3