path: root/common
diff options
authorwm4 <wm4@nowhere>2016-07-01 20:56:59 +0200
committerwm4 <wm4@nowhere>2016-07-01 20:56:59 +0200
commitd057e7a142a327c653f3f0379014567028448b5d (patch)
tree3bcc4dd515ac8bd5db975cfae12075bb3cb584be /common
parent3738bfb451c8558ed6f3710a72d418e7c68f7f5b (diff)
player: fatal error if linked and compiled FFmpeg versions mismatch
We don't support this anymore. This tries to exit in a controlled way after command line options are applied in order to honor logging options and, in case of libmpv, not to kill the host. Not sure if it would be better to just vomit text to stderr and call abort().
Diffstat (limited to 'common')
2 files changed, 6 insertions, 10 deletions
diff --git a/common/av_log.c b/common/av_log.c
index 804972889f..64ce26d853 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -189,7 +189,7 @@ struct lib {
unsigned runv;
-void print_libav_versions(struct mp_log *log, int v)
+bool print_libav_versions(struct mp_log *log, int v)
const struct lib libs[] = {
{"libavutil", LIBAVUTIL_VERSION_INT, avutil_version()},
@@ -222,14 +222,7 @@ void print_libav_versions(struct mp_log *log, int v)
mp_msg(log, v, "%s version: %s\n", LIB_PREFIX, av_version_info());
- if (mismatch) {
- // Using mismatched libraries can be legitimate, but even then it's
- // a bad idea. We don't acknowledge its usefulness and stability.
- mp_warn(log, "Warning: mpv was compiled against a different version of "
- "%s than the shared\nlibrary it is linked against. This is "
- "most likely a broken build\nand misbehavior and crashes are "
- "to be expected.\n", LIB_PREFIX);
- }
+ return !mismatch;
#undef V
diff --git a/common/av_log.h b/common/av_log.h
index 17326b609f..18f7fc9d82 100644
--- a/common/av_log.h
+++ b/common/av_log.h
@@ -1,8 +1,11 @@
#ifndef MP_AV_LOG_H
#define MP_AV_LOG_H
+#include <stdbool.h>
struct mpv_global;
struct mp_log;
void init_libav(struct mpv_global *global);
void uninit_libav(struct mpv_global *global);
-void print_libav_versions(struct mp_log *log, int v);
+bool print_libav_versions(struct mp_log *log, int v);