use PIL.Image if available

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
 

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