tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/src/octoprint/server/api/settings.py b/src/octoprint/server/api/settings.py
2index c3e6cea10..ced2f8fa0 100644
3--- a/src/octoprint/server/api/settings.py
4+++ b/src/octoprint/server/api/settings.py
5@@ -130,7 +130,7 @@ data["webcam"] = {
6 "webcamEnabled": s.getBoolean(["webcam", "webcamEnabled"]),
7 "snapshotTimeout": s.getInt(["webcam", "snapshotTimeout"]),
8 "timelapseEnabled": s.getBoolean(["webcam", "timelapseEnabled"]),
9- "ffmpegPath": s.get(["webcam", "ffmpeg"]),
10+ "ffmpegPath": "@ffmpeg@",
11 "ffmpegCommandline": s.get(["webcam", "ffmpegCommandline"]),
12 "bitrate": s.get(["webcam", "bitrate"]),
13 "ffmpegThreads": s.get(["webcam", "ffmpegThreads"]),
14@@ -548,8 +548,6 @@ def _saveSettings(data):
15 ["webcam", "snapshotSslValidation"],
16 data["webcam"]["snapshotSslValidation"],
17 )
18- if "ffmpegPath" in data["webcam"]:
19- s.set(["webcam", "ffmpeg"], data["webcam"]["ffmpegPath"])
20 if "ffmpegCommandline" in data["webcam"]:
21 commandline = data["webcam"]["ffmpegCommandline"]
22 if not all(