Skip to content

Commit

Permalink
media-video/mpv: make message less scary in ffmpeg patch
Browse files Browse the repository at this point in the history
"Most likely a broken build" isn't the best thing to tell our users
especially because in most cases it isn't a broken build.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
  • Loading branch information
Coacher authored and SoapGentoo committed Feb 14, 2017
1 parent ac64696 commit cdd878c
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ player: make ffmpeg/libav version check non-fatal
We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.

diff --git a/player/main.c b/player/main.c
index 67dde34..ee133a9 100644
index 67dde3449..696d2e716 100644
--- a/player/main.c
+++ b/player/main.c
@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
Expand All @@ -20,9 +20,9 @@ index 67dde34..ee133a9 100644
+ print_libav_versions(mpctx->log, MSGL_WARN);
+ MP_WARN(mpctx, "\nmpv was compiled against a different version of "
+ "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+ "This is most likely a broken build and could\nresult in "
+ "misbehavior and crashes.\n\nUpstream does not support this "
+ "configuration.\nPlease rebuild mpv in case of any problems.\n");
+ "This could result in misbehavior and crashes.\n\n"
+ "Upstream does not support this configuration.\n"
+ "Please rebuild mpv in case of any problems.\n");
}

if (opts->dump_stats && opts->dump_stats[0]) {

0 comments on commit cdd878c

Please sign in to comment.