Merge pull request #4 from Zulko/master

merge

moviepy/video/VideoClip.py

@@ -1,7 +1,7 @@
 """
 This module implements VideoClip (base class for video clips) and its
 main subclasses:
-- Animated clips:     VideofileClip, DirectoryClip
+- Animated clips:     VideofileClip, ImageSequenceClip
 - Static image clips: ImageClip, ColorClip, TextClip,
 """
 
@@ -382,7 +382,7 @@ def write_images_sequence(self, nameformat, fps=None, verbose=True,
         ------
 
         The resulting image sequence can be read using e.g. the class
-        ``DirectoryClip``.
+        ``ImageSequenceClip``.
 
         """
 
@@ -553,7 +553,7 @@ def blit_on(self, picture, t):
 
         # is the position relative (given in % of the clip's size) ?
         if self.relative_pos:
-            for i, dim in enumerate(wf, hf):
+            for i, dim in enumerate([wf, hf]):
                 if not isinstance(pos[i], str):
                     pos[i] = dim * pos[i]
 
@@ -1067,7 +1067,7 @@ class TextClip(ImageClip):
       for a list of acceptable names.
 
     color
-      Color of the background. See ``TextClip.list('color')`` for a
+      Color of the text. See ``TextClip.list('color')`` for a
       list of acceptable names.
 
     font

moviepy/video/fx/resize.py

@@ -67,7 +67,7 @@ def resize(clip, newsize=None, height=None, width=None, apply_to_mask=True):
     
     newsize:
       Can be either 
-        - ``(height,width)`` in pixels or a float representing
+        - ``(width,height)`` in pixels or a float representing
         - A scaling factor, like 0.5
         - A function of time returning one of these.
             

moviepy/video/tools/interpolators.py

@@ -41,7 +41,7 @@ def addx(self, x):
 
     def addy(self, y):
 
-        return Trajectory(self.tt, self.xx+y, self.yy)
+        return Trajectory(self.tt, self.xx, self.yy+y)
 
     def update_interpolators(self):
         self.xi =  Interpolator(self.tt, self.xx)

moviepy/video/tools/tracking.py

@@ -70,7 +70,7 @@ def manual_tracking(clip, t1=None, t2=None, fps=None, nobjects = 1,
                                        nobjects=3, savefile="track.txt")
     >>> # ...
     >>> # LATER, IN ANOTHER SCRIPT, RECOVER THESE TRAJECTORIES
-    >>> from moviepy.tools.tracking import Trajectory
+    >>> from moviepy.video.tools.tracking import Trajectory
     >>> traj1, traj2, traj3 = Trajectory.load_list('track.txt')
     >>> # If ever you only have one object being tracked, recover it with
     >>> traj, =  Trajectory.load_list('track.txt')