Merge branch 'master' into pep8

Zulko · Feb 12, 2018 · f92157b · f92157b
2 parents 824818d + d6708b3
commit f92157b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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)
@@ -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)

diff --git a/moviepy/video/tools/tracking.py b/moviepy/video/tools/tracking.py
@@ -8,6 +8,7 @@
 of the tracking time interval).
 """
 
+import numpy as np
 from scipy.interpolate import interp1d
 
 from ..io.preview import imdisplay