From 27fb39768160ad5aa2becdc6d8d8b64aed3934e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 13 Oct 2016 19:23:15 +0200 Subject: [PATCH] ffmpeg: Only modify the -framerate parameter for setting video fps -r only allows a limited set of target framerates according to the mpeg2 standard, but -framerate allows to specify how long each frame should be shown, giving us full control over "virtual" fps without causing errors when the user selects a non-standard frame rate --- src/octoprint/timelapse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/timelapse.py b/src/octoprint/timelapse.py index 3e404fcc..abea529b 100644 --- a/src/octoprint/timelapse.py +++ b/src/octoprint/timelapse.py @@ -736,7 +736,7 @@ class TimelapseRenderJob(object): command = [ ffmpeg, '-framerate', str(fps), '-loglevel', 'error', '-i', '"{}"'.format(input), '-vcodec', 'mpeg2video', - '-threads', str(threads), '-pix_fmt', 'yuv420p', '-r', str(fps), '-y', '-b', str(bitrate), + '-threads', str(threads), '-pix_fmt', 'yuv420p', '-r', "25", '-y', '-b', str(bitrate), '-f', 'vob'] filter_string = cls._create_filter_string(hflip=hflip,