diff options
| author |   Ilya Tumaykin <itumaykin@gmail.com> | 2017-02-13 00:15:50 +0300 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2017-02-14 22:41:03 +0100 |
| commit | cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9 (patch) | |
| tree | 70f9e0f2dd6baf4b8cdb5b0f672b08e94d2b9d80 | |
| parent | media-video/mpv: sync 9999 with latest versioned (diff) | |
| download | gentoo-cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9.tar.gz gentoo-cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9.tar.bz2 gentoo-cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9.zip | |
media-video/mpv: make message less scary in ffmpeg patch
"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
| -rw-r--r-- | media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch index 96a1f566a600..7c8d5b44c825 100644 --- a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch +++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch @@ -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) @@ -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]) { |