From 82abf5755a523db2b0df35999efa29a7227030bd Mon Sep 17 00:00:00 2001 From: cclauss Date: Mon, 5 Feb 2018 17:23:07 +0100 Subject: [PATCH 1/2] =?UTF-8?q?res=20=E2=80=94>=20size=20to=20align=20with?= =?UTF-8?q?=20line=2062?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes undefined name issues found in #705 --- moviepy/video/io/ffmpeg_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/moviepy/video/io/ffmpeg_tools.py b/moviepy/video/io/ffmpeg_tools.py index b3a7c2ae1..97f0a06d6 100644 --- a/moviepy/video/io/ffmpeg_tools.py +++ b/moviepy/video/io/ffmpeg_tools.py @@ -62,7 +62,7 @@ def ffmpeg_extract_audio(inputfile,output,bitrate=3000,fps=44100): def ffmpeg_resize(video,output,size): """ resizes ``video`` to new size ``size`` and write the result in file ``output``. """ - cmd= [get_setting("FFMPEG_BINARY"), "-i", video, "-vf", "scale=%d:%d"%(res[0], res[1]), + cmd= [get_setting("FFMPEG_BINARY"), "-i", video, "-vf", "scale=%d:%d"%(size[0], size[1]), output] subprocess_call(cmd) From 7f346774debecfa6f2571d1e2b1cf7afb8747042 Mon Sep 17 00:00:00 2001 From: cclauss Date: Mon, 5 Feb 2018 17:56:44 +0100 Subject: [PATCH 2/2] Also fix undefined names bitrate and self.(fps) --- moviepy/video/io/ffmpeg_tools.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/moviepy/video/io/ffmpeg_tools.py b/moviepy/video/io/ffmpeg_tools.py index 97f0a06d6..a84d20783 100644 --- a/moviepy/video/io/ffmpeg_tools.py +++ b/moviepy/video/io/ffmpeg_tools.py @@ -8,7 +8,7 @@ from moviepy.config import get_setting -def ffmpeg_movie_from_frames(filename, folder, fps, digits=6): +def ffmpeg_movie_from_frames(filename, folder, fps, digits=6, bitrate='v'): """ Writes a movie out of the frames (picture files) in a folder. Almost deprecated. @@ -18,7 +18,7 @@ def ffmpeg_movie_from_frames(filename, folder, fps, digits=6): "-r", "%d"%fps, "-i", os.path.join(folder,folder) + '/' + s, "-b", "%dk"%bitrate, - "-r", "%d"%self.fps, + "-r", "%d"%fps, filename] subprocess_call(cmd)