From cf16459ad788be25fc2e4a6dc65f077404b4539c Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Sat, 25 Jun 2016 20:16:50 +0200
Subject: [PATCH] use PIL.Image if available

---
 oxtimelines/ffmpeg.py   | 5 ++++-
 oxtimelines/timeline.py | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/oxtimelines/ffmpeg.py b/oxtimelines/ffmpeg.py
index c941b94..2b3df7f 100644
--- a/oxtimelines/ffmpeg.py
+++ b/oxtimelines/ffmpeg.py
@@ -6,7 +6,10 @@ from __future__ import division, with_statement, print_function
 import fractions
 import subprocess
 
-import Image
+try:
+    from PIL import Image
+except:
+    import Image
 import numpy as np
 import ox
 
diff --git a/oxtimelines/timeline.py b/oxtimelines/timeline.py
index a5204e8..4b3fcae 100644
--- a/oxtimelines/timeline.py
+++ b/oxtimelines/timeline.py
@@ -5,7 +5,10 @@ from __future__ import division, with_statement, print_function
 
 from glob import glob
 from time import time
-import Image
+try:
+    from PIL import Image
+except:
+    import Image
 import math
 import os