MKV: update patches

Don't force a ffmpeg HASH and fix conflict for "libvlc_media: add cookie_jar
API".

Resources/MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,4 +1,4 @@
-From 3c2834f1a36ee7c0009ed53758a7a904b08eee9e Mon Sep 17 00:00:00 2001
+From fa421881b056403144329e7f7f423dcda0a8a308 Mon Sep 17 00:00:00 2001
 From: David Geldreich <david.geldreich@free.fr>
 Date: Fri, 20 Apr 2012 16:41:19 +0200
 Subject: [PATCH 01/15] arm_neon: added function macro to handle the underscore

Resources/MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,4 +1,4 @@
-From 3539a20625a8b2900baee4a659b5eab535487cc3 Mon Sep 17 00:00:00 2001
+From 7d27c294e5084db778143e6745840065601e4755 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Aug 2012 16:02:07 +0200
 Subject: [PATCH 02/15] deinterlace/merge: use a macro to fix compilation for

Resources/MobileVLCKit/patches/0003-arm_neon-work-around-libtool-issue.patch

@@ -1,4 +1,4 @@
-From 0c87cbda66d3b9101701ef506f6b59ab8e33fe4f Mon Sep 17 00:00:00 2001
+From 29e2573375b9b57edf23e6b6be8d412aa339af5e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 18 Dec 2014 22:14:55 +0100
 Subject: [PATCH 03/15] arm_neon: work-around libtool issue

Resources/MobileVLCKit/patches/0004-arm_neon-fix-iOS-linking.patch

@@ -1,4 +1,4 @@
-From 33a8df736ff9e9e7c2ebdb36bc539a2eaf9adb79 Mon Sep 17 00:00:00 2001
+From 55a2810ff4e91031a765fdf0a9ebabe5072f6033 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Subject: [PATCH 04/15] arm_neon: fix iOS linking

Resources/MobileVLCKit/patches/0005-disable-neon-volume-plugin.patch

@@ -1,4 +1,4 @@
-From d1de2f86d70ded86d67e333cf1a2ab5f0e97af70 Mon Sep 17 00:00:00 2001
+From 2a4fa81246e3e3d5ec118802533f6760578c983f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 10 Dec 2014 22:14:55 +0100
 Subject: [PATCH 05/15] disable neon volume plugin

Resources/MobileVLCKit/patches/0006-libvlc-create-VT-zero-copy-variable.patch

@@ -1,4 +1,4 @@
-From cfbd97e03c938e48d298d9977a4203aedb6ce567 Mon Sep 17 00:00:00 2001
+From 3a9e051faebf8da66bf33eac8e384057c96156fa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 4 May 2016 16:00:40 +0200
 Subject: [PATCH 06/15] libvlc: create VT-zero-copy variable
@@ -8,10 +8,10 @@ Subject: [PATCH 06/15] libvlc: create VT-zero-copy variable
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 1ed1d84c15..ad9b54b6d2 100644
+index f5ec04a10e..adf450d99e 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -626,6 +626,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -641,6 +641,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
  #endif
  #ifdef __APPLE__
      var_Create (mp, "drawable-nsobject", VLC_VAR_ADDRESS);

Resources/MobileVLCKit/patches/0007-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,4 +1,4 @@
-From 24d31b8b6a3d84c91f52f5d48861e7c6f878e201 Mon Sep 17 00:00:00 2001
+From af1a5192ffb663d13d8ea2127a2865918e0ab1e3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sun, 7 Dec 2014 20:02:18 +0100
 Subject: [PATCH 07/15] contrib/gcrypt: work-around a libtool limitation

Resources/MobileVLCKit/patches/0008-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,4 +1,4 @@
-From 943e1677084059129e0dce4f3784ba9dab288020 Mon Sep 17 00:00:00 2001
+From af89b95b7a7144801f39b86be35504d7c62d319e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Sat, 3 Oct 2015 22:45:14 +0200
 Subject: [PATCH 08/15] contrib/gcrypt: fix tvOS compilation

Resources/MobileVLCKit/patches/0009-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -1,5 +1,5 @@
-From 256b8ff5033279982a533c8da9a0c7e6f5e40dd3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+From 1fa30ef90c3f6992c6b6b26cd3e5bba7c03f5062 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=83=C2=BChne?= <fkuehne@videolan.org>
 Date: Tue, 12 Jul 2016 13:50:54 +0200
 Subject: [PATCH 09/15] contrib/avcodec: enforce use of FFmpeg
 
@@ -8,7 +8,7 @@ Subject: [PATCH 09/15] contrib/avcodec: enforce use of FFmpeg
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index aef18d3c1d..803a18a040 100644
+index 2b4778c826..842a61b9d7 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -2,10 +2,10 @@
@@ -19,8 +19,8 @@ index aef18d3c1d..803a18a040 100644
 +USE_FFMPEG ?= 1
  
  ifdef USE_FFMPEG
--FFMPEG_HASH=cbd622be997e8307a409efc3b4bbe8765147def2
-+FFMPEG_HASH=9157ac2f9c867a6e0ce013ede965de3832374729
+-FFMPEG_HASH=46998d037f8bfebee7bb6578df24a5a3b8f41299
++FFMPEG_HASH=911417f0b34e611bf084319c5b5a4e4e630da940
  FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
  FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
  else

Resources/MobileVLCKit/patches/0010-Enable-System-DL.patch

@@ -1,4 +1,4 @@
-From d02332c5904c15cdfdd0f73c7549df3cb2af5f06 Mon Sep 17 00:00:00 2001
+From fdb7a3f58b0d9919cfc3607c765b8af09af32f4f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 22 Jul 2016 11:11:44 +0200
 Subject: [PATCH 10/15] Enable System DL
@@ -36,7 +36,7 @@ index 0000000000..2d60cf7140
 +         in_format.mSampleRate = avctx->sample_rate ? avctx->sample_rate : 44100;
 +         in_format.mChannelsPerFrame = avctx->channels ? avctx->channels : 1;
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 803a18a040..2db0a0b836 100644
+index 842a61b9d7..b950b027dd 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -24,6 +24,9 @@ FFMPEGCONF = \
@@ -49,7 +49,7 @@ index 803a18a040..2db0a0b836 100644
  	--disable-debug \
  	--disable-avdevice \
  	--disable-devices \
-@@ -228,6 +231,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
+@@ -224,6 +227,7 @@ ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
  	rm -Rf $@ $@-$(FFMPEG_BASENAME)
  	mkdir -p $@-$(FFMPEG_BASENAME)
  	tar xvJf "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)

Resources/MobileVLCKit/patches/0011-taglib-DO-NOT-PUSH-works-with-networks-accesses.patch

@@ -1,4 +1,4 @@
-From 28132ec22bbfb245440a707650411629a5ab245d Mon Sep 17 00:00:00 2001
+From 8ba8849bc5d510be22f2dc8a52b64594d36e7805 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 22 Jul 2016 11:20:24 +0200
 Subject: [PATCH 11/15] taglib: DO NOT PUSH: works with networks accesses

Resources/MobileVLCKit/patches/0012-contrib-gcrypt-update-patches.patch

@@ -1,4 +1,4 @@
-From 4f87126782f893578cbd5a7ad839b81549d9f1af Mon Sep 17 00:00:00 2001
+From 865aed65f9088f5495fecba4d9d7a8dd74c7aa44 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:03:37 +0200
 Subject: [PATCH 12/15] contrib/gcrypt: update patches

Resources/MobileVLCKit/patches/0013-deinterlace-merge-arm64-fix-linking-on-appleOS.patch

@@ -1,4 +1,4 @@
-From ef93774fd7a3a6c5e7478d625ebd2502fe3d539f Mon Sep 17 00:00:00 2001
+From 038c89300806762f8dfa052f88dfa6fe5dce4cb3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 12 Sep 2016 17:04:05 +0200
 Subject: [PATCH 13/15] deinterlace-merge-arm64: fix linking on appleOS

Resources/MobileVLCKit/patches/0014-http-add-vlc_http_cookies_clear.patch

@@ -1,4 +1,4 @@
-From 603acedfd2defc005958bb93aa4ff9a133b00941 Mon Sep 17 00:00:00 2001
+From e47a1f507b01c9178527ab3318d8bd5612519ca9 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
 Subject: [PATCH 14/15] http: add vlc_http_cookies_clear
@@ -23,10 +23,10 @@ index ed7e1613da..da1fe4ef1a 100644
  
  /**
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index 57c83495a3..3352b848d6 100644
+index 4cb7a22503..419523a7f7 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
-@@ -135,6 +135,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
+@@ -136,6 +136,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
  vlc_http_auth_FormatAuthorizationHeader
  vlc_http_cookies_new
  vlc_http_cookies_destroy

Resources/MobileVLCKit/patches/0015-libvlc_media-add-cookie_jar-API.patch

@@ -1,4 +1,4 @@
-From 44f47df8754266193613094c732ac760f8ab75db Mon Sep 17 00:00:00 2001
+From 47f3f623506fe1695773ef326c7e2f02ffe34100 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
 Subject: [PATCH 15/15] libvlc_media: add cookie_jar API
@@ -139,10 +139,10 @@ index f063ddb5fa..17bbd84fac 100644
  
  /* Media Descriptor */
 diff --git a/lib/media_player.c b/lib/media_player.c
-index ad9b54b6d2..650e53e58b 100644
+index adf450d99e..e0cf0ee20e 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -605,6 +605,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -620,6 +620,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT);
      var_Create (mp, "sout", VLC_VAR_STRING);
      var_Create (mp, "demux-filter", VLC_VAR_STRING);
@@ -150,9 +150,9 @@ index ad9b54b6d2..650e53e58b 100644
  
      /* Video */
      var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
-@@ -955,6 +956,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
-         return -1;
-     }
+@@ -971,6 +972,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
+     for( size_t i = 0; i < ARRAY_SIZE( p_mi->selected_es ); ++i )
+         p_mi->selected_es[i] = ES_INIT;
  
 +    if( p_mi->p_md->p_cookie_jar )
 +    {