646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
|
|
index c3e6cea10..ced2f8fa0 100644
|
|
--- a/src/octoprint/server/api/settings.py
|
|
+++ b/src/octoprint/server/api/settings.py
|
|
@@ -130,7 +130,7 @@ data["webcam"] = {
|
|
"webcamEnabled": s.getBoolean(["webcam", "webcamEnabled"]),
|
|
"snapshotTimeout": s.getInt(["webcam", "snapshotTimeout"]),
|
|
"timelapseEnabled": s.getBoolean(["webcam", "timelapseEnabled"]),
|
|
- "ffmpegPath": s.get(["webcam", "ffmpeg"]),
|
|
+ "ffmpegPath": "@ffmpeg@",
|
|
"ffmpegCommandline": s.get(["webcam", "ffmpegCommandline"]),
|
|
"bitrate": s.get(["webcam", "bitrate"]),
|
|
"ffmpegThreads": s.get(["webcam", "ffmpegThreads"]),
|
|
@@ -548,8 +548,6 @@ def _saveSettings(data):
|
|
["webcam", "snapshotSslValidation"],
|
|
data["webcam"]["snapshotSslValidation"],
|
|
)
|
|
- if "ffmpegPath" in data["webcam"]:
|
|
- s.set(["webcam", "ffmpeg"], data["webcam"]["ffmpegPath"])
|
|
if "ffmpegCommandline" in data["webcam"]:
|
|
commandline = data["webcam"]["ffmpegCommandline"]
|
|
if not all(
|