Fixed crash when supplying FFMPEG_BINARY environment variable #30022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ClearlyClaire
approved these changes
Apr 22, 2024
ClearlyClaire
added
bug
ClearlyClaire
pushed a commit
that referenced
this pull request
May 10, 2024
ClearlyClaire
pushed a commit
that referenced
this pull request
May 10, 2024
ClearlyClaire
pushed a commit
that referenced
this pull request
May 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #28375
The code that picks up
FFMPEG_BINARYas an environment variable inconfig/initializers/ffmpeg.rbcurrently assigns it to an object that doesn't exist anywhere in the code base. This change updates that assignment to use theconfig.xcustom config object used for other custom config options, as well as adding a check for the new environment variableFFPROBE_BINARY. The new variable is because one of the the three locations Mastodon usesffmpegactually uses theffprobeutility and these have separate binary files.