From 7bea25db75f1cee7426e86362d636adc7e4f1175 Mon Sep 17 00:00:00 2001
From: vexorian <vexorian@gmail.com>
Date: Sat, 9 Jan 2021 10:03:32 -0400
Subject: [PATCH 1/2] Prepare 1.2.3 development

---
 README.md        | 2 +-
 src/constants.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0738cfd..1f6777a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# dizqueTV 1.2.2-prerelease
+# dizqueTV 1.2.3-prerelease
 ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/vexorian/dizquetv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/vexorian/dizquetv?logo=docker&logoColor=fff&style=flat-square)
 
 Create live TV channel streams from media on your Plex servers.
diff --git a/src/constants.js b/src/constants.js
index 2211eda..174be43 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -5,5 +5,5 @@ module.exports = {
     TVGUIDE_MAXIMUM_FLEX_DURATION : 6 * 60 * 60 * 1000,
     TOO_FREQUENT: 100,
 
-    VERSION_NAME: "1.2.2-prerelease"
+    VERSION_NAME: "1.2.3-prerelease"
 }

From a3b74e8af53866a5aafc2d31eed01883a399052c Mon Sep 17 00:00:00 2001
From: vexorian <vexorian@gmail.com>
Date: Sat, 9 Jan 2021 10:01:59 -0400
Subject: [PATCH 2/2] #219 Better ffmpeg version handling.

---
 src/ffmpeg-info.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ffmpeg-info.js b/src/ffmpeg-info.js
index ef264fd..5b25391 100644
--- a/src/ffmpeg-info.js
+++ b/src/ffmpeg-info.js
@@ -15,7 +15,12 @@ class FFMPEGInfo {
                     }
                 });
             });
-            return s.match( /version ([^\s]+) Copyright/ )[1];
+            var m = s.match( /version\s+([^\s]+)\s+[^\s].*Copyright/ )
+            if (m == null) {
+                console.error("ffmpeg -version command output not in the expected format: " + s);
+                return s;
+            }
+            return m[1];
         } catch (err) {
             console.error("Error getting ffmpeg version", err);
             return "Error";