From eadf0e59fda3b442bf660b562c5fc4a70ba18c33 Mon Sep 17 00:00:00 2001
From: tassaron2
Date: Sun, 15 Mar 2020 22:22:50 -0400
Subject: quick update to be somewhat compatible with newer versions of Pillow,
 ffmpeg, and Ubuntu

---
 src/gui/mainwindow.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/gui/mainwindow.py')

diff --git a/src/gui/mainwindow.py b/src/gui/mainwindow.py
index 81c5d7c..53a6bd1 100644
--- a/src/gui/mainwindow.py
+++ b/src/gui/mainwindow.py
@@ -320,12 +320,12 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # verify Pillow version
         if not self.settings.value("pilMsgShown") \
-                and 'post' not in Image.PILLOW_VERSION:
+                and 'post' not in Image.__version__:
             self.showMessage(
                 msg="You are using the standard version of the "
                 "Python imaging library (Pillow %s). Upgrade "
                 "to the Pillow-SIMD fork to enable hardware accelerations "
-                "and export videos faster." % Image.PILLOW_VERSION
+                "and export videos faster." % Image.__version__
             )
             self.settings.setValue("pilMsgShown", True)
 
@@ -336,7 +336,8 @@ class MainWindow(QtWidgets.QMainWindow):
                     ffmpegVers = checkOutput(
                         ['ffmpeg', '-version'], stderr=f
                     )
-                goodVersion = str(ffmpegVers).split()[2].startswith('3')
+                goodVersion = (str(ffmpegVers).split()[2].startswith('3') or
+                    str(ffmpegVers).split()[2].startswith('4'))
             except Exception:
                 goodVersion = False
         else:
-- 
cgit v1.2.3