Merge pull request #428 from earney/issue_145

fix issue 145. raise Exception when concatenate method != chain or c…
Zulko · Feb 20, 2017 · 35b4e5e · 35b4e5e
2 parents 3d91ddd + 1bb1e3c
commit 35b4e5e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/moviepy/video/compositing/concatenate.py b/moviepy/video/compositing/concatenate.py
@@ -102,6 +102,9 @@ def make_frame(t):
         result = CompositeVideoClip( [c.set_start(t).set_pos('center')
                                 for (c, t) in zip(clips, tt)],
                size = (w, h), bg_color=bg_color, ismask=ismask)
+    else:
+        raise Exception("Moviepy Error: The 'method' argument of "
+                        "concatenate_videoclips must be 'chain' or 'compose'")
 
     result.tt = tt