diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 index 79342dcd7..6165a4119 100644 --- a/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 +++ b/src/octoprint/plugins/corewizard/templates/corewizard_webcam_wizard.jinja2 @@ -29,14 +29,3 @@ {% include "snippets/settings/webcam/webcamStreamUrl.jinja2" %} {% include "snippets/settings/webcam/webcamSnapshotUrl.jinja2" %} - -
- To render the snapshots into timelapse recordings, OctoPrint also needs to - know the correct path to FFMPEG. -
{% endtrans %} - - 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 @@ def getSettings(): "snapshotUrl": s.get(["webcam", "snapshot"]), "snapshotTimeout": s.getInt(["webcam", "snapshotTimeout"]), "snapshotSslValidation": s.getBoolean(["webcam", "snapshotSslValidation"]), - "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(