Merge branch 'dev'

datarhei · Nov 14, 2022 · 6638b42 · 6638b42
2 parents 8a45e4c + 7fcc5bb
commit 6638b42
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Restreamer-UI
 
+## v1.5.0 > v1.5.1
+
+-   Fix FFmpeg version check for RTSP sources (datarhei/restreamer#455)
+-   Fix requires Core >= v16.11.0 and FFmpeg >= 5.1.0
+
 ## v1.4.0 > v1.5.0
 
 -   Add changelog viewer

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "restreamer-ui",
-	"version": "1.5.0",
-	"bundle": "restreamer-v2.4.0",
+	"version": "1.5.1",
+	"bundle": "restreamer-v2.4.1",
 	"private": false,
 	"license": "Apache-2.0",
 	"dependencies": {
@@ -89,4 +89,4 @@
 		"react-error-overlay": "^6.0.11"
 	},
 	"resolutions": {}
-}
+}
diff --git a/src/version.js b/src/version.js
@@ -1,7 +1,7 @@
 import pkg from '../package.json';
 
-const Core = '^16.10.1';
-const FFmpeg = '^4.1.0 || ^5.0.0';
+const Core = '^16.11.0';
+const FFmpeg = '^5.1.0';
 const UI = pkg.bundle ? pkg.bundle : pkg.name + ' v' + pkg.version;
 const Version = pkg.version;
 

diff --git a/src/views/Edit/Sources/Network.js b/src/views/Edit/Sources/Network.js
@@ -131,13 +131,14 @@ const initSkills = (initialSkills) => {
 
 	const skills = {
 		ffmpeg: {},
+		formats: {},
 		protocols: {},
 		...initialSkills,
 	};
 
 	skills.ffmpeg = {
 		version: '0.0.0',
-		...skills.version,
+		...skills.ffmpeg,
 	};
 
 	skills.formats = {