Version 2.3.3 (#47)

* Fixing #46 max-cll was being sent incorrectly to x265-params (thanks to HannesJo0139) * Fixing #43 audio bitrate being set to wrong track (thanks to HannesJo0139)
cdgriffith · Aug 21, 2020 · a4b93bd · a4b93bd
1 parent b225304
commit a4b93bd
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 19 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,12 @@
 Changelog
 ---------
 
+Version 2.3.3
+~~~~~~~~~~~~~
+
+* Fixing #46 max-cll was being sent incorrectly to x265-params (thanks to HannesJo0139)
+* Fixing #43 audio bitrate being set to wrong track (thanks to HannesJo0139)
+
 Version 2.3.2
 ~~~~~~~~~~~~~
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2019 Chris Griffith
+Copyright (c) 2019-2020 Chris Griffith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/build-licenses.txt b/docs/build-licenses.txt
@@ -15,7 +15,7 @@ PySide2 is dynamically linked.
 
 The MIT License
 
-Copyright (c) 2019 Chris Griffith
+Copyright (c) 2019-2020 Chris Griffith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
 MIT License
 
-Copyright (c) 2017-2019 Chris Griffith
+Copyright (c) 2017-2020 Chris Griffith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -63,7 +63,7 @@ SOFTWARE.
 
 The MIT License (MIT)
 
-Copyright (c) 2014-2017 Chris Griffith
+Copyright (c) 2014-2020 Chris Griffith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/fastflix/flix.py b/fastflix/flix.py
@@ -409,7 +409,7 @@ def s(a, v):
                     luminance=f"({s(item, 'max_luminance')},{s(item, 'min_luminance')})",
                 )
             if item.side_data_type == "Content light level metadata":
-                cll = f"({item.max_content},{item.max_average})"
+                cll = f"{item.max_content},{item.max_average}"
 
         return Box(
             pix_fmt=data.pix_fmt,

diff --git a/fastflix/plugins/common/audio.py b/fastflix/plugins/common/audio.py
@@ -16,7 +16,7 @@ def build_audio(audio_tracks, audio_file_index=0):
             command_list.append(f"-c:{track.outdex} copy")
         elif "conversion" in track:
             command_list.append(
-                f"-c:{track.outdex} {track.conversion.codec} -b:a:{track.outdex} {track.conversion.bitrate} {downmix}"
+                f"-c:{track.outdex} {track.conversion.codec} -b:{track.outdex} {track.conversion.bitrate} {downmix}"
             )
 
     return " ".join(command_list)
diff --git a/fastflix/version.py b/fastflix/version.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "2.3.2"
+__version__ = "2.3.3"
 __author__ = "Chris Griffith"
diff --git a/fastflix/widgets/about.py b/fastflix/widgets/about.py
@@ -47,29 +47,29 @@ def __init__(self, parent=None):
         layout.addWidget(label)
         layout.addWidget(supporting_libraries_label)
 
-        if Path(base_path, "bundled").exists():
-            bundle_label = QtWidgets.QLabel(
-                "Bundled with: <a href='https://github.com/OpenVisualCloud/SVT-AV1'>SVT AV1</a> (Modified BSD) and "
-                "<a href='https://www.ffmpeg.org/download.html'>ffmpeg</a> (LGPL)"
-            )
-            bundle_label.setAlignment(QtCore.Qt.AlignCenter)
-            bundle_label.setOpenExternalLinks(True)
-            layout.addWidget(bundle_label)
+        bundle_label = QtWidgets.QLabel(
+            "Conversion Tools<br> <a href='https://github.com/OpenVisualCloud/SVT-AV1'>SVT AV1</a> (Modified BSD) and "
+            "<a href='https://www.ffmpeg.org/download.html'>FFmpeg</a> (Various)"
+        )
+        bundle_label.setAlignment(QtCore.Qt.AlignCenter)
+        bundle_label.setOpenExternalLinks(True)
+        layout.addWidget(bundle_label)
 
         if pyinstaller:
             pyinstaller_label = QtWidgets.QLabel(
                 "Packaged with: <a href='https://www.pyinstaller.org/index.html'>" "PyInstaller</a>"
             )
             pyinstaller_label.setAlignment(QtCore.Qt.AlignCenter)
             pyinstaller_label.setOpenExternalLinks(True)
+            layout.addWidget(QtWidgets.QLabel())
             layout.addWidget(pyinstaller_label)
 
-        replacer = "\\"
         license_label = QtWidgets.QLabel(
-            f"<a href='file:///{base_path.replace(replacer, '/')}/docs/build-licenses.txt' download>LICENSES</a>"
+            f"<a href='https://github.com/cdgriffith/FastFlix/blob/master/docs/build-licenses.txt'>LICENSES</a>"
         )
         license_label.setAlignment(QtCore.Qt.AlignCenter)
         license_label.setOpenExternalLinks(True)
+        layout.addWidget(QtWidgets.QLabel())
         layout.addWidget(license_label)
 
         self.setLayout(layout)

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastflix"
-version = "2.3.2"
+version = "2.3.3"
 description = "Easy to use video encoder GUI wrapper"
 authors = ["Chris Griffith <[email protected]>"]
 license = "MIT"
@@ -12,7 +12,7 @@ python = "^3.6"
 appdirs = "^1.4.4"
 PySide2 = "^5.15.0"
 shiboken2 = "^5.15.0"
-python-box = {version = "^5.0.1", extras = ["all"]}
+python-box = {version = "^5.1.1", extras = ["all"]}
 requests = "^2.24.0"
 reusables = "^0.9.5"
 "ruamel.yaml" = "^0.16.10"