[SCM] mpv/master: Suppress ffmpeg version mismatch error

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e7bad5734701473694013713ef3abca1ac7d2c8a
Author: James Cowgill <jcowgill at debian.org>
Date:   Wed Aug 10 14:24:53 2016 +0000

    Suppress ffmpeg version mismatch error
    
    Closes: #831537

diff --git a/debian/patches/06_ffmpeg-abi.patch b/debian/patches/06_ffmpeg-abi.patch
new file mode 100644
index 0000000..ad0826c
--- /dev/null
+++ b/debian/patches/06_ffmpeg-abi.patch
@@ -0,0 +1,29 @@
+Description: Surpress ffmpeg version mismatch error
+ Requiring an exact ffmpeg version isn't helpful in a distribution where all ABI
+ issues should already be handled by package dependencies. Rebuilding every time
+ ffmpeg is updated is also completely unmaintainable.
+Author: James Cowgill <jcowgill at debian.org>
+Bug-Debian: https://bugs.debian.org/831537
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/player/main.c
++++ b/player/main.c
+@@ -418,18 +418,6 @@ int mp_initialize(struct MPContext *mpct
+     if (handle_help_options(mpctx))
+         return -2;
+ 
+-    if (!print_libav_versions(mp_null_log, 0)) {
+-        // Using mismatched libraries can be legitimate, but even then it's
+-        // a bad idea. We don't acknowledge its usefulness and stability.
+-        print_libav_versions(mpctx->log, MSGL_FATAL);
+-        MP_FATAL(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\nmpv does not support this "
+-                 "configuration and will not run - rebuild mpv instead.\n");
+-        return -1;
+-    }
+-
+     if (opts->dump_stats && opts->dump_stats[0]) {
+         if (mp_msg_open_stats_file(mpctx->global, opts->dump_stats) < 0)
+             MP_ERR(mpctx, "Failed to open stats file '%s'\n", opts->dump_stats);
diff --git a/debian/patches/series b/debian/patches/series
index a0ccbcc..30203d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_waf.patch
 04_waf-pie.patch
 05_add-keywords.patch
+06_ffmpeg-abi.patch

-- 
mpv packaging