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

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `VideoFileClip.coreader()` that creates a new clip created from the same source file as the original (to complement the existing `AudioFileClip.coreader()`) [#1332]
 
 ### Changed <!-- for changes in existing functionality -->
+Lots of method and parameter names have been changed. This will be explained better in the documentation soon. See https://github.com/Zulko/moviepy/pull/1170 for more information. [#1170]
 
 ### Deprecated <!-- for soon-to-be removed features -->
 - `moviepy.video.fx.all` and `moviepy.audio.fx.all`. Use the fx method directly from the clip instance or import the fx function from `moviepy.video.fx` and `moviepy.audio.fx`. [#1105]
@@ -23,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed <!-- for any bug fixes -->
 - Fixed BitmapClip with fps != 1 not returning the correct frames or crashing [#1333]
+- Fixed `rotate` sometimes failing with `ValueError: axes don't match array` [#1335]
 
 
 ## [v2.0.0.dev2](https://github.com/zulko/moviepy/tree/v2.0.0.dev2)

moviepy/video/fx/rotate.py

@@ -62,8 +62,6 @@ def rotate(clip, angle, unit="deg", resample="bicubic", expand=True):
         def get_angle(t):
             return angle
 
-    transpose = [1, 0] if clip.is_mask else [1, 0, 2]
-
     def filter(get_frame, t):
 
         angle = get_angle(t)
@@ -72,6 +70,8 @@ def filter(get_frame, t):
         if unit == "rad":
             angle = 360.0 * angle / (2 * np.pi)
 
+        transpose = [1, 0] if len(im.shape) == 2 else [1, 0, 2]
+
         angle %= 360
         if (angle == 0) and expand:
             return im