diff options
author | wm4 <wm4@nowhere> | 2020-03-08 18:54:01 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-03-08 19:38:10 +0100 |
commit | 62c1d7972449f8ed0f8d5db895367fab26ab56ff (patch) | |
tree | 014fac7cccf87836ee5a3830485b402bd631c344 /player/main.c | |
parent | d0d9ace421ea86c0642c57865c41248df1fe0b00 (diff) | |
download | mpv-62c1d7972449f8ed0f8d5db895367fab26ab56ff.tar.bz2 mpv-62c1d7972449f8ed0f8d5db895367fab26ab56ff.tar.xz |
player: rearrange libav* library check
No need to be nice. Also hopefully breaks idiotic distro patches.
Diffstat (limited to 'player/main.c')
-rw-r--r-- | player/main.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/player/main.c b/player/main.c index 9dbd160a70..3d38be4f43 100644 --- a/player/main.c +++ b/player/main.c @@ -144,7 +144,7 @@ void mp_print_version(struct mp_log *log, int always) int v = always ? MSGL_INFO : MSGL_V; mp_msg(log, v, "%s %s\n built on %s\n", mpv_version, mpv_copyright, mpv_builddate); - print_libav_versions(log, v); + check_library_versions(log, v); mp_msg(log, v, "\n"); // Only in verbose mode. if (!always) { @@ -371,17 +371,7 @@ int mp_initialize(struct MPContext *mpctx, char **options) if (handle_help_options(mpctx)) return 1; // help - if (!print_libav_versions(mp_null_log, 0)) { - // This happens only if the runtime FFmpeg version is lower than the - // build version, which will not work according to FFmpeg's ABI rules. - // This does not happen if runtime FFmpeg is newer, which is compatible. - print_libav_versions(mpctx->log, MSGL_FATAL); - MP_FATAL(mpctx, "\nmpv was compiled against an incompatible 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\nThis is a broken build.\n"); - return -1; - } + check_library_versions(mp_null_log, 0); #if HAVE_TESTS if (opts->test_mode && opts->test_mode[0]) |