From 2ae87897f564d776e33befcf1171afe830c909a8 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 4 Feb 2021 10:44:06 -0500 Subject: [PATCH] test --- stream/__init__.py | 12 ++---------- webwatch_conf.json | 5 ----- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/stream/__init__.py b/stream/__init__.py index 5bd9dfa..2f62e9e 100644 --- a/stream/__init__.py +++ b/stream/__init__.py @@ -164,17 +164,9 @@ class Plugin_OBJ(): def transcode_profiles(self, stream_args): ffmpeg_command = [] - if not self.plugin_utils.config.dict["webwatch"]["ffmpeg_transcode"] == "nvenc": - ffmpeg_command.extend([ - "-hwaccel", "cuda", - "-c:v", "h264_nvenc", - "-c:a", "copy", - "-f", "mp4" - ]) - else: - ffmpeg_command.extend([ + ffmpeg_command.extend([ "-c:v", "copy", - "-c:a", "libvorbis", + "-c:a", "copy", "-f", "webm" ]) diff --git a/webwatch_conf.json b/webwatch_conf.json index d0b0166..dc9ea1c 100644 --- a/webwatch_conf.json +++ b/webwatch_conf.json @@ -4,11 +4,6 @@ "value": "none", "config_file": true, "config_web": true - }, - "ffmpeg_transcode":{ - "value": "none", - "config_file": true, - "config_web": true } } }