mpv/mpv-make-ffmpeg-version-check-non-fatal.patch

29 lines
1.5 KiB
Diff
Raw Normal View History

player: make ffmpeg/libav version check non-fatal
We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
Index: mpv-0.21.0/player/main.c
===================================================================
--- mpv-0.21.0.orig/player/main.c
+++ mpv-0.21.0/player/main.c
@@ -432,13 +432,12 @@ int mp_initialize(struct MPContext *mpct
if (!print_libav_versions(mp_null_log, 0)) {
// Using mismatched libraries can be legitimate, but even then it's
// a bad idea. We don't acknowledge its usefulness and stability.
- print_libav_versions(mpctx->log, MSGL_FATAL);
- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
- "This is most likely a broken build and could\nresult in "
- "misbehavior and crashes.\n\nmpv does not support this "
- "configuration and will not run - rebuild mpv instead.\n");
- return -1;
+ print_libav_versions(mpctx->log, MSGL_WARN);
+ MP_WARN(mpctx, "\nmpv was compiled against a different version of "
+ "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+ "This is most likely a broken build and could\nresult in "
+ "misbehavior and crashes.\n\nUpstream does not support this "
+ "configuration.\nPlease rebuild mpv in case of any problems.\n");
}
if (!mpctx->playlist->first && !opts->player_idle_mode)