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 /common/av_log.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 'common/av_log.c')
-rw-r--r-- | common/av_log.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/common/av_log.c b/common/av_log.c index d7df24e05c..8122d3a65b 100644 --- a/common/av_log.c +++ b/common/av_log.c @@ -176,7 +176,7 @@ struct lib { unsigned runv; }; -bool print_libav_versions(struct mp_log *log, int v) +void check_library_versions(struct mp_log *log, int v) { const struct lib libs[] = { {"libavutil", LIBAVUTIL_VERSION_INT, avutil_version()}, @@ -189,21 +189,22 @@ bool print_libav_versions(struct mp_log *log, int v) mp_msg(log, v, "FFmpeg library versions:\n"); - bool mismatch = false; for (int n = 0; n < MP_ARRAY_SIZE(libs); n++) { const struct lib *l = &libs[n]; mp_msg(log, v, " %-15s %d.%d.%d", l->name, V(l->buildv)); - if (l->buildv != l->runv) { + if (l->buildv != l->runv) mp_msg(log, v, " (runtime %d.%d.%d)", V(l->runv)); - mismatch = l->buildv > l->runv || - AV_VERSION_MAJOR(l->buildv) != AV_VERSION_MAJOR(l->runv); - } mp_msg(log, v, "\n"); + if (l->buildv > l->runv || + AV_VERSION_MAJOR(l->buildv) != AV_VERSION_MAJOR(l->runv)) + { + fprintf(stderr, "%s: %d.%d.%d -> %d.%d.%d\n", + l->name, V(l->buildv), V(l->runv)); + abort(); + } } mp_msg(log, v, "FFmpeg version: %s\n", av_version_info()); - - return !mismatch; } #undef V |