From 62c1d7972449f8ed0f8d5db895367fab26ab56ff Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 8 Mar 2020 18:54:01 +0100 Subject: player: rearrange libav* library check No need to be nice. Also hopefully breaks idiotic distro patches. --- common/av_log.c | 17 +++++++++-------- common/av_log.h | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'common') 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 diff --git a/common/av_log.h b/common/av_log.h index 18f7fc9d82..ae12838c35 100644 --- a/common/av_log.h +++ b/common/av_log.h @@ -7,5 +7,5 @@ struct mpv_global; struct mp_log; void init_libav(struct mpv_global *global); void uninit_libav(struct mpv_global *global); -bool print_libav_versions(struct mp_log *log, int v); +void check_library_versions(struct mp_log *log, int v); #endif -- cgit v1.2.3