Merge branch 'master' of github.com:Zulko/moviepy

Zulko · Mar 9, 2017 · dfb67c3 · dfb67c3
2 parents 86489fb + 11de2a6
commit dfb67c3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py
@@ -84,7 +84,7 @@ def make_frame(t):
 
         result = VideoClip(ismask = ismask, make_frame = make_frame)
         if any([c.mask is not None for c in clips]):
-            masks = [c.mask if (c.mask is not None) else
+            masks = [c.mask.set_duration(c.duration) if (c.mask is not None) else
                      ColorClip([1,1], col=1, ismask=True, duration=c.duration)
                  #ColorClip(c.size, col=1, ismask=True).set_duration(c.duration)
                      for c in clips]

diff --git a/tests/test_issues.py b/tests/test_issues.py
@@ -21,6 +21,14 @@ def test_issue_145():
     with pytest.raises(Exception, message="Expecting Exception"):
          final = concatenate_videoclips([video], method = 'composite')
 
+def test_issue_285():
+    clip_1 = ImageClip('media/python_logo.png', duration=10)
+    clip_2 = ImageClip('media/python_logo.png', duration=10)
+    clip_3 = ImageClip('media/python_logo.png', duration=10)
+
+    merged_clip = concatenate_videoclips([clip_1, clip_2, clip_3])
+    assert merged_clip.duration == 30
+
 def test_issue_407():
     red = ColorClip((800, 600), color=(255,0,0)).set_duration(5)
     red.fps=30