Merge branch 'release/1.2.1'

CHANGELOG.md

@@ -1,3 +1,8 @@
+### Version 1.2.1 (2016-01-20)
+
+  - fix: __iter__ would incorrectly raise an IOError at the end of some Videos
+  - docker: pre-fetch MoviePy's own ffmpeg
+
 ### Version 1.2 (2016-01-15)
 
   - feat: face processing

Dockerfile

@@ -4,4 +4,8 @@ MAINTAINER Hervé Bredin <[email protected]>
 ADD . /src
 RUN pip install -e /src
 
+# moviepy likes to download its own ffmpeg version at import time
+# this command will guarantee this is done once and for all
+RUN python -c "from moviepy.editor import VideoClip"
+
 VOLUME /src

pyannote/video/video.py

@@ -340,7 +340,7 @@ def _read_frame(self):
                 "Using the last valid frame instead.",
                 UserWarning)
 
-            if not hasattr(self, 'lastread'):
+            if not hasattr(self, '_lastread'):
                 message = (
                     "MoviePy error: failed to read the first frame of "
                     "video file %s. That might mean that the file is "
@@ -463,5 +463,5 @@ def _close(self):
 
     def __del__(self):
         self._close()
-        if hasattr(self, 'lastread'):
+        if hasattr(self, '_lastread'):
             del self._lastread