summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-18 14:21:31 +0200
committerwm4 <wm4@nowhere>2015-07-18 14:21:31 +0200
commit55943333379b27f3c19a475b83a001a1cd96946c (patch)
tree4c8e6d44b7bfd0cf105f3b4bff38bfb313c76d95
parentbad3996d857aaa81632cab4f7e05001cf5ba6adc (diff)
downloadmpv-55943333379b27f3c19a475b83a001a1cd96946c.tar.bz2
mpv-55943333379b27f3c19a475b83a001a1cd96946c.tar.xz
av_log: remove dumb shit
It's the user's fault if he/she/it does something that is not recommended. Fixes #2110.
-rw-r--r--common/av_log.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/common/av_log.c b/common/av_log.c
index 48e1c07144..05542cd15a 100644
--- a/common/av_log.c
+++ b/common/av_log.c
@@ -209,36 +209,13 @@ void print_libav_versions(struct mp_log *log, int v)
mp_msg(log, v, "%s library versions:\n", LIB_PREFIX);
- bool mismatch = false;
- bool broken = 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 = true;
- broken |= ((l->buildv & 255) >= 100) != ((l->runv & 255) >= 100);
- }
mp_msg(log, v, "\n");
}
- // This just won't work. It's 100% broken.
- if (broken) {
- mp_fatal(log, "mpv was compiled and linked against a mixture of Libav "
- "and FFmpeg versions. This won't work and will most likely "
- "crash at some point. Aborting.\n");
- abort();
- }
- // We don't "really" support mismatched libraries, but if you like to
- // suffer, you're free to enjoy the terrible aspects of dynamic linking.
- // In particular, we don't use all these crazy accessors ffmpeg wants us
- // to use in order to be ABI compatible after Libav merges - because that
- // would make our code incompatible to Libav. It's madness.
- if (mismatch) {
- mp_warn(log, "Warning: mpv was compiled against a different version of "
- "%s than the shared\nlibrary it is linked against. This can "
- "expose subtle ABI compatibility issues\nand can lead to "
- "misbehavior and crashes.\n", LIB_PREFIX);
- }
#if HAVE_AV_VERSION_INFO
mp_msg(log, v, "%s version: %s\n", LIB_PREFIX, av_version_info());