From: ayleph <ayleph@thisshitistemp.com>
Date: Fri, 18 Dec 2015 02:06:42 +0000 (-0500)
Subject: Fix Issue 5375 Deprecated function in video thumb
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6e38fec80ebaadc3b3cfdc912f40cc4e8bb9b31c;p=mediagoblin.git

Fix Issue 5375 Deprecated function in video thumb

This patch fixes issue 5375 by replacing a function call that has
been removed in recent versions of PIL with the recommended
replacement.

(cherry picked from commit 564a48e018bcd786aa32b232cb7216be3ef3fb5e)
---

diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py
index 57912c54..f8020497 100644
--- a/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@ -132,7 +132,7 @@ def capture_thumb(video_path, dest_path, width=None, height=None, percent=0.5):
     buffer = sample.get_buffer()
 
     # get the image from the buffer and save it to disk
-    im = Image.fromstring('RGB', (width, height),
+    im = Image.frombytes('RGB', (width, height),
                          buffer.extract_dup(0, buffer.get_size()))
     im.save(dest_path)
     _log.info('thumbnail saved to {0}'.format(dest_path))