diff options
| author | wm4 <wm4@nowhere> | 2016-07-01 20:56:59 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-07-01 20:56:59 +0200 |
| commit | d057e7a142a327c653f3f0379014567028448b5d (patch) | |
| tree | 3bcc4dd515ac8bd5db975cfae12075bb3cb584be /common/av_log.c | |
| parent | 3738bfb451c8558ed6f3710a72d418e7c68f7f5b (diff) | |
| download | mpv-d057e7a142a327c653f3f0379014567028448b5d.tar.bz2 mpv-d057e7a142a327c653f3f0379014567028448b5d.tar.xz | |
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/av_log.c')
| -rw-r--r-- | common/av_log.c | 11 |
1 files changed, 2 insertions, 9 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()); #endif - 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 |