Merge branch 'master' into tests

Zulko · Mar 2, 2017 · 31144db · 31144db
2 parents f60bf65 + 9821199
commit 31144db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/moviepy/video/tools/tracking.py b/moviepy/video/tools/tracking.py
@@ -63,7 +63,7 @@ def manual_tracking(clip, t1=None, t2=None, fps=None, nobjects = 1,
     ---------
     
     >>> from moviepy.editor import VideoFileClip
-    >>> from moviepy.tools.tracking import manual_tracking
+    >>> from moviepy.video.tools.tracking import manual_tracking
     >>> clip = VideoFileClip("myvideo.mp4")
     >>> # manually indicate 3 trajectories, save them to a file
     >>> trajectories = manual_tracking(clip, t1=5, t2=7, fps=5,

diff --git a/tests/test_VideoFileClip.py b/tests/test_VideoFileClip.py
@@ -19,4 +19,4 @@ def test_setup():
     assert clip.size == [1024*3, 800]
 
 if __name__ == '__main__':
-   pytest.main()
+   pytest.main()