mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #3503] Fix: Change to ffmpeg detection. #9564
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Original Pull Request: https://github.com/jellyfin/jellyfin/pull/3503
State: closed
Merged: No
Fix
Dictionary matching wasn't working for me, as my ffmpeg had additional modules installed.
Changes
Added version 4.3 to the dictionary.
The code builds a list of modules found in the dictionary, in the order that they appear in the dictionary for matching.
If no match is found, a further comparison is made, but only using the libavutil. The nearest match is found, and that version number is returned with an revision increment so that the system knows it's a custom build.
eg.
ffmpeg version git-2020-06-28-4cfcfb3 Copyright (c) 2000-2020 the FFmpeg developers
libavutil 56. 55.100 / 56. 55.100
libavcodec 58. 93.100 / 58. 93.100
libavformat 58. 47.100 / 58. 47.100
libavdevice 58. 11.100 / 58. 11.100
libavfilter 7. 86.100 / 7. 86.100
libswscale 5. 8.100 / 5. 8.100
libswresample 3. 8.100 / 3. 8.100
libpostproc 55. 8.100 / 55. 8.100
now identifies as: Found custom ffmpeg. Approximating version around 4.3
ffmpeg version N-95234-g35a63a9127 Copyright (c) 2000-2019 the FFmpeg developers
libavutil 56. 35.100 / 56. 35.100
libavcodec 58. 59.101 / 58. 59.101
libavformat 58. 33.100 / 58. 33.100
libavdevice 58. 9.100 / 58. 9.100
libavfilter 7. 62.100 / 7. 62.100
libswscale 5. 6.100 / 5. 6.100
libswresample 3. 6.100 / 3. 6.100
libpostproc 55. 6.100 / 55. 6.100
now identifies as: Found custom ffmpeg. Approximating version around 4.2