diff options
| author | tassaron2 | 2020-03-15 22:22:50 -0400 |
|---|---|---|
| committer | tassaron2 | 2020-03-15 22:22:50 -0400 |
| commit | eadf0e59fda3b442bf660b562c5fc4a70ba18c33 (patch) | |
| tree | 2e0fada254144edf27f3c8a66056ebbd3ae0631c /src | |
| parent | 22978a0635e906f8ebfa1de81cdc38fd96aad756 (diff) | |
quick update to be somewhat compatible with newer versions of Pillow, ffmpeg, and Ubuntu
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/mainwindow.py | 7 |
1 files changed, 4 insertions, 3 deletions
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: |
