From 3018f023f91dd9e2028500f67e9ca36fc6d7eadf Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 14 Jul 2020 10:00:44 -0500 Subject: [PATCH] Version 2.1.1 (#31) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixing parse_hdr_details bug (thanks to Jan Temešinko and schlotkins) --- CHANGES | 5 +++++ flix/flix.py | 6 +++++- flix/version.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 08b86a00..65b908b5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,11 @@ Changelog --------- +Version 2.1.1 +~~~~~~~~~~~~~ + +* Fixing parse_hdr_details bug (thanks to Jan Temešinko and schlotkins) + Version 2.1.0 ~~~~~~~~~~~~~ diff --git a/flix/flix.py b/flix/flix.py index 976efb22..3fbdfe73 100644 --- a/flix/flix.py +++ b/flix/flix.py @@ -378,7 +378,11 @@ def parse_hdr_details(self, video_source, video_track=0): ) result = run(command, shell=True, stdout=PIPE, stderr=PIPE) - data = Box.from_json(result.stdout.decode("utf-8"), default_box=True, default_box_attr=None) + try: + data = Box.from_json(result.stdout.decode("utf-8"), default_box=True, default_box_attr=None) + except BoxError: + # No details to parse + return if "frames" not in data or not len(data.frames): return data = data.frames[0] diff --git a/flix/version.py b/flix/version.py index f59826c8..7c71c0ba 100644 --- a/flix/version.py +++ b/flix/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -__version__ = "2.1.0" +__version__ = "2.1.1" __author__ = "Chris Griffith"