Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change ffmpeg handling #4688

Merged
merged 7 commits into from
Mar 21, 2024
Merged

Conversation

WithoutPants
Copy link
Collaborator

Changes the general behaviour of ffmpeg resolution as follows:

  • setup no longer automatically downloads ffmpeg during the initial system creation. Instead, if ffmpeg or ffprobe are not detected, then the user is presented with an option to download ffmpeg as a post-setup step
    image
  • added settings to set the ffmpeg and ffprobe paths, and added a task to download the binaries (which is done automatically during setup if the user checks the box)
    image
  • changed the ffmpeg/ffprobe resolution code to check the config directory first, then the path environment, and finally the $HOME/.stash directory - instead of path first, then config, then .stash. This means that the binaries can be overridden without explicitly setting the path by storing them in the config directory.

Resolves #4218

@WithoutPants WithoutPants added the improvement Something needed tweaking. label Mar 14, 2024
@WithoutPants WithoutPants added this to the Version 0.26.0 milestone Mar 14, 2024
@WithoutPants WithoutPants merged commit 7086109 into stashapp:develop Mar 21, 2024
2 checks passed
halkeye pushed a commit to halkeye/stash that referenced this pull request Sep 1, 2024
* Make ffmpeg/ffprobe settable and remove auto download
* Detect when ffmpeg not present in setup
* Add download ffmpeg task
* Add download ffmpeg button in system settings
* Download ffmpeg during setup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Something needed tweaking.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature] Add FFmpeg location option to Settings > System
1 participant