neoris/dizquetv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #220 from vexorian/20210109_dev

Browse Source 
20210109 dev
This commit is contained in:
vexorian 2021-01-09 10:09:29 -04:00 committed by GitHub
commit a1ca124c5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.

2
src/constants.js
View File

@ -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"
}

7
src/ffmpeg-info.js
View File

@ -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";