[SCM] mpv/master: Refresh patches

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d95ca2003f02014e057ac31420f187ed8a0487ad
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Oct 20 09:43:36 2016 +0000

    Refresh patches

diff --git a/debian/patches/02_fix-config-path.patch b/debian/patches/02_fix-config-path.patch
index 2d438b4..d8de516 100644
--- a/debian/patches/02_fix-config-path.patch
+++ b/debian/patches/02_fix-config-path.patch
@@ -7,7 +7,7 @@ Last-Update: 2015-05-03
 
 --- a/DOCS/man/mpv.rst
 +++ b/DOCS/man/mpv.rst
-@@ -926,7 +926,7 @@ FILES
+@@ -920,7 +920,7 @@ FILES
  
  For Windows-specifics, see `FILES ON WINDOWS`_ section.
  
diff --git a/debian/patches/06_ffmpeg-abi.patch b/debian/patches/06_ffmpeg-abi.patch
index aae39fb..d5651f8 100644
--- a/debian/patches/06_ffmpeg-abi.patch
+++ b/debian/patches/06_ffmpeg-abi.patch
@@ -8,9 +8,9 @@ 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
-@@ -416,18 +416,6 @@ int mp_initialize(struct MPContext *mpct
-     if (handle_help_options(mpctx))
-         return -2;
+@@ -429,18 +429,6 @@ int mp_initialize(struct MPContext *mpct
+ 
+     handle_deprecated_options(mpctx);
  
 -    if (!print_libav_versions(mp_null_log, 0)) {
 -        // Using mismatched libraries can be legitimate, but even then it's
@@ -24,6 +24,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -        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);
+     if (!mpctx->playlist->first && !opts->player_idle_mode)
+         return -3;
+ 

-- 
mpv packaging