Browse Source

MVK: update libvlc

Felix Paul Kühne 8 years ago
parent
commit
9e1f81cfd9
23 changed files with 118 additions and 89 deletions
  1. 2 2
      MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch
  2. 2 2
      MobileVLCKit/patches/0002-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch
  3. 4 4
      MobileVLCKit/patches/0003-lib-media-player-inherit-deinterlace-variable-to-ach.patch
  4. 2 2
      MobileVLCKit/patches/0004-arm_neon-work-around-libtool-issue.patch
  5. 2 2
      MobileVLCKit/patches/0005-arm_neon-fix-iOS-linking.patch
  6. 2 2
      MobileVLCKit/patches/0006-disable-neon-volume-plugin.patch
  7. 2 2
      MobileVLCKit/patches/0007-src-misc-fix-compilation-for-OS-without-fork.patch
  8. 5 5
      MobileVLCKit/patches/0008-libvlc-hack-to-disable-daemon-mode.patch
  9. 14 14
      MobileVLCKit/patches/0009-libvlc-expose-a-base-set-of-freetype-options-to-over.patch
  10. 5 5
      MobileVLCKit/patches/0010-libvlc-create-VT-zero-copy-variable.patch
  11. 2 2
      MobileVLCKit/patches/0011-contrib-gcrypt-work-around-a-libtool-limitation.patch
  12. 2 2
      MobileVLCKit/patches/0012-contrib-gcrypt-fix-tvOS-compilation.patch
  13. 2 2
      MobileVLCKit/patches/0013-contrib-avcodec-enforce-use-of-FFmpeg.patch
  14. 2 2
      MobileVLCKit/patches/0014-Enable-System-DL.patch
  15. 8 8
      MobileVLCKit/patches/0015-Add-AC-3-pass-through.patch
  16. 2 2
      MobileVLCKit/patches/0016-taglib-DO-NOT-PUSH-works-with-networks-accesses.patch
  17. 2 2
      MobileVLCKit/patches/0017-contrib-gcrypt-update-patches.patch
  18. 2 2
      MobileVLCKit/patches/0018-deinterlace-merge-arm64-fix-linking-on-appleOS.patch
  19. 15 15
      MobileVLCKit/patches/0019-ios2-vout-add-subpicture-rendering-in-the-zero-copy-.patch
  20. 8 8
      MobileVLCKit/patches/0020-libvlc_media-add-cookie_jar-API.patch
  21. 3 3
      MobileVLCKit/patches/0021-http-add-vlc_http_cookies_clear.patch
  22. 29 0
      MobileVLCKit/patches/0022-videotoolbox-temporarily-disable-H263-decoding-on-iO.patch
  23. 1 1
      buildMobileVLCKit.sh

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

@@ -1,7 +1,7 @@
-From b77e2c6c9bc14ee1581739ee72de8b529963a895 Mon Sep 17 00:00:00 2001
+From 3a46a99d4e2cb4846bb8f9320ae63aaf7bbd038d 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/21] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/22] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---

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

@@ -1,7 +1,7 @@
-From 1f9dcbd160033a3b7691822e2c6da046cba4e9a8 Mon Sep 17 00:00:00 2001
+From 262dd1814661205767f5045c1ce19fa50bbbeb1e 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/21] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/22] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---

+ 4 - 4
MobileVLCKit/patches/0003-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From 568faded72bc4202dcd9b385ef19376390b918bb Mon Sep 17 00:00:00 2001
+From 6d98276cf32f2407525ca310f10f74ef5cd975ab Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 9 Dec 2014 22:14:55 +0100
-Subject: [PATCH 03/21] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 03/22] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 03/21] lib/media player: inherit deinterlace variable to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 69d3523..f2e9d03 100644
+index 9a8f73a..4a7e2b8 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -640,7 +640,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -644,7 +644,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
      var_Create (mp, "crop", VLC_VAR_STRING);

+ 2 - 2
MobileVLCKit/patches/0004-arm_neon-work-around-libtool-issue.patch

@@ -1,7 +1,7 @@
-From 3ec9d85ec8a1eed10d4921cc4c0f6a106b9e60d1 Mon Sep 17 00:00:00 2001
+From 60b9e034eebaf638e011798a5b092b3ee0aac0f7 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 04/21] arm_neon: work-around libtool issue
+Subject: [PATCH 04/22] arm_neon: work-around libtool issue
 
 ---
  modules/arm_neon/Makefile.am | 2 ++

+ 2 - 2
MobileVLCKit/patches/0005-arm_neon-fix-iOS-linking.patch

@@ -1,7 +1,7 @@
-From 2daaeba0149f65ec77fd0070c5a3c7f3c80698d8 Mon Sep 17 00:00:00 2001
+From 0c3ec4c963c94516326c8b853b4089acf297b8fa 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/21] arm_neon: fix iOS linking
+Subject: [PATCH 05/22] arm_neon: fix iOS linking
 
 ---
  modules/arm_neon/amplify.S              |  7 ++---

+ 2 - 2
MobileVLCKit/patches/0006-disable-neon-volume-plugin.patch

@@ -1,7 +1,7 @@
-From cfc1785694d06aeebcd479e13d4edb37a808248a Mon Sep 17 00:00:00 2001
+From 4319d10b0f47b908286cf85326c6a96ed0fde5a5 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 06/21] disable neon volume plugin
+Subject: [PATCH 06/22] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -

+ 2 - 2
MobileVLCKit/patches/0007-src-misc-fix-compilation-for-OS-without-fork.patch

@@ -1,7 +1,7 @@
-From f1dc84e88dd25c3f8be22628d16bdda50ebfd117 Mon Sep 17 00:00:00 2001
+From 0ec727b72a1ead2e47d864711c494d2478a27b61 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Thu, 10 Sep 2015 19:58:40 +0200
-Subject: [PATCH 07/21] src/misc: fix compilation for OS without fork()
+Subject: [PATCH 07/22] src/misc: fix compilation for OS without fork()
 
 ---
  src/misc/cpu.c | 2 +-

+ 5 - 5
MobileVLCKit/patches/0008-libvlc-hack-to-disable-daemon-mode.patch

@@ -1,18 +1,18 @@
-From ea0a31fbafad8c098ba0328c6ed77cce241fc675 Mon Sep 17 00:00:00 2001
+From ee7b6789d81b9f9aff7b6769983316eb36f5e157 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 11 Sep 2015 18:34:26 +0200
-Subject: [PATCH 08/21] libvlc: hack to disable daemon mode
+Subject: [PATCH 08/22] libvlc: hack to disable daemon mode
 
 ---
  src/libvlc.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/src/libvlc.c b/src/libvlc.c
-index 48c2b8c..3c9f879 100644
+index d3ce702..8cdc0bc 100644
 --- a/src/libvlc.c
 +++ b/src/libvlc.c
-@@ -200,6 +200,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
-         return VLC_ENOMOD;
+@@ -196,6 +196,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
+         goto error;
      }
  
 +#ifdef __APPLE__

+ 14 - 14
MobileVLCKit/patches/0009-libvlc-expose-a-base-set-of-freetype-options-to-over.patch

@@ -1,7 +1,7 @@
-From 98acf952cd11e3c9eae16552187d8eea744cc8e7 Mon Sep 17 00:00:00 2001
+From 31a1240a7c78cf1ec7e0e06109f3bdd0ca07d2d1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 23 Nov 2015 16:09:24 +0100
-Subject: [PATCH 09/21] libvlc: expose a base set of freetype options to
+Subject: [PATCH 09/22] libvlc: expose a base set of freetype options to
  overwrite the default font
 
 ---
@@ -14,10 +14,10 @@ Subject: [PATCH 09/21] libvlc: expose a base set of freetype options to
  6 files changed, 163 insertions(+), 4 deletions(-)
 
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index 9153196..b873656 100644
+index 9a73b4f..b768844 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1511,6 +1511,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -1527,6 +1527,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  LIBVLC_API void libvlc_video_set_adjust_float( libvlc_media_player_t *p_mi,
                                                     unsigned option, float value );
  
@@ -51,10 +51,10 @@ index 9153196..b873656 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index 733a4dd..f297970 100644
+index 84e7189..18eaea3 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -245,6 +245,9 @@ libvlc_video_get_spu_count
+@@ -256,6 +256,9 @@ libvlc_video_get_spu_count
  libvlc_video_get_spu_delay
  libvlc_video_get_spu_description
  libvlc_video_get_teletext
@@ -64,7 +64,7 @@ index 733a4dd..f297970 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -269,6 +272,9 @@ libvlc_video_set_spu
+@@ -280,6 +283,9 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -75,10 +75,10 @@ index 733a4dd..f297970 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index f2e9d03..8d54c93 100644
+index 4a7e2b8..029e5cc 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -670,6 +670,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -674,6 +674,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
  
@@ -92,10 +92,10 @@ index f2e9d03..8d54c93 100644
      var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
      var_Create (mp, "audio-device", VLC_VAR_STRING);
 diff --git a/lib/video.c b/lib/video.c
-index b2c9b34..6af4e1c 100644
+index 8655a32..dc13b7e 100644
 --- a/lib/video.c
 +++ b/lib/video.c
-@@ -635,7 +635,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
+@@ -636,7 +636,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
  }
  
  typedef const struct {
@@ -104,7 +104,7 @@ index b2c9b34..6af4e1c 100644
      unsigned type;
  } opt_t;
  
-@@ -664,6 +664,9 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
+@@ -665,6 +665,9 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
          case VLC_VAR_FLOAT:
              var_SetFloat( p_mi, opt->name, value );
              break;
@@ -114,7 +114,7 @@ index b2c9b34..6af4e1c 100644
          default:
              libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
              return;
-@@ -687,6 +690,8 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
+@@ -688,6 +691,8 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
          return var_GetInteger(p_mi, opt->name);
      case VLC_VAR_FLOAT:
          return lroundf(var_GetFloat(p_mi, opt->name));
@@ -123,7 +123,7 @@ index b2c9b34..6af4e1c 100644
      default:
          libvlc_printerr( "Invalid argument to %s in %s", name, "get int" );
          return 0;
-@@ -910,3 +915,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
+@@ -911,3 +916,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
  {
      return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
  }

+ 5 - 5
MobileVLCKit/patches/0010-libvlc-create-VT-zero-copy-variable.patch

@@ -1,21 +1,21 @@
-From faa078203401c357439e6ca5c4a892fd9b00cad1 Mon Sep 17 00:00:00 2001
+From c1119862c21ecb533ecd9d179572ba877dde1f16 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 10/21] libvlc: create VT-zero-copy variable
+Subject: [PATCH 10/22] libvlc: create VT-zero-copy variable
 
 ---
  lib/media_player.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 8d54c93..143e240 100644
+index 029e5cc..fded5ed 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -622,6 +622,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -626,6 +626,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
  #endif
  #ifdef __APPLE__
      var_Create (mp, "drawable-nsobject", VLC_VAR_ADDRESS);
-+    var_Create (mp, "videotoolbox-zero-copy", VLC_VAR_BOOL);
++    var_Create (mp, "videotoolbox-zero-copy", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
  #endif
  #ifdef __ANDROID__
      var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);

+ 2 - 2
MobileVLCKit/patches/0011-contrib-gcrypt-work-around-a-libtool-limitation.patch

@@ -1,7 +1,7 @@
-From 34311718ed3151216ff866463b624f9b719947f4 Mon Sep 17 00:00:00 2001
+From 39d78601282d534a5d07e0f8492e9473601f84af 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 11/21] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 11/22] contrib/gcrypt: work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/rules.mak                       |  1 +

+ 2 - 2
MobileVLCKit/patches/0012-contrib-gcrypt-fix-tvOS-compilation.patch

@@ -1,7 +1,7 @@
-From 3d3f0547990df1d61336b9290de398a93678599a Mon Sep 17 00:00:00 2001
+From e40db64896fadb3c3b6e11f6b7617a5ea5519521 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 12/21] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 12/22] contrib/gcrypt: fix tvOS compilation
 
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++

+ 2 - 2
MobileVLCKit/patches/0013-contrib-avcodec-enforce-use-of-FFmpeg.patch

@@ -1,7 +1,7 @@
-From 03be2bff27bce5ad365003f940fccf0f3cf9a5a3 Mon Sep 17 00:00:00 2001
+From d3f8f05a501733ce8e4f6b8610226f53095e7423 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Tue, 12 Jul 2016 13:50:54 +0200
-Subject: [PATCH 13/21] contrib/avcodec: enforce use of FFmpeg
+Subject: [PATCH 13/22] contrib/avcodec: enforce use of FFmpeg
 
 ---
  contrib/src/ffmpeg/rules.mak | 4 ++--

+ 2 - 2
MobileVLCKit/patches/0014-Enable-System-DL.patch

@@ -1,7 +1,7 @@
-From 04af09993b0eff92d048d1094768f6fb0c4af8d8 Mon Sep 17 00:00:00 2001
+From 67a706681de7d6099f943d73452313b5de8701b4 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 14/21] Enable System DL
+Subject: [PATCH 14/22] Enable System DL
 
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++

+ 8 - 8
MobileVLCKit/patches/0015-Add-AC-3-pass-through.patch

@@ -1,7 +1,7 @@
-From afe7c3f18438fe0451bfd9f07b914ed1ba8b412a Mon Sep 17 00:00:00 2001
+From 001563c3b663f496dc9d8acb222a01f975ee6263 Mon Sep 17 00:00:00 2001
 From: Aman Gupta <aman@tmm1.net>
 Date: Tue, 1 Mar 2016 16:31:13 +0100
-Subject: [PATCH 15/21] Add AC-3 pass-through
+Subject: [PATCH 15/22] Add AC-3 pass-through
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -29,10 +29,10 @@ index 1528861..66077d5 100755
  visual
  fb
 diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
-index b873656..e5f1b5b 100644
+index b768844..17d2894 100644
 --- a/include/vlc/libvlc_media_player.h
 +++ b/include/vlc/libvlc_media_player.h
-@@ -1846,6 +1846,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
+@@ -1862,6 +1862,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
  LIBVLC_API int libvlc_audio_set_delay( libvlc_media_player_t *p_mi, int64_t i_delay );
  
  /**
@@ -50,10 +50,10 @@ index b873656..e5f1b5b 100644
   *
   * \return number of presets
 diff --git a/lib/audio.c b/lib/audio.c
-index 7901c64..3877311 100644
+index 3aed6f5..094cc02 100644
 --- a/lib/audio.c
 +++ b/lib/audio.c
-@@ -472,6 +472,22 @@ int libvlc_audio_set_channel( libvlc_media_player_t *mp, int channel )
+@@ -473,6 +473,22 @@ int libvlc_audio_set_channel( libvlc_media_player_t *mp, int channel )
  }
  
  /*****************************************************************************
@@ -77,10 +77,10 @@ index 7901c64..3877311 100644
   *****************************************************************************/
  int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi )
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 143e240..ac30787 100644
+index fded5ed..1b87fd2 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -641,6 +641,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -645,6 +645,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
      var_Create (mp, "crop", VLC_VAR_STRING);

+ 2 - 2
MobileVLCKit/patches/0016-taglib-DO-NOT-PUSH-works-with-networks-accesses.patch

@@ -1,7 +1,7 @@
-From 8878842c49a19614da381274e55baca79931fc03 Mon Sep 17 00:00:00 2001
+From 41960674564c252876708e807f78e5de99c00dba Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 22 Jul 2016 11:20:24 +0200
-Subject: [PATCH 16/21] taglib: DO NOT PUSH: works with networks accesses
+Subject: [PATCH 16/22] taglib: DO NOT PUSH: works with networks accesses
 
 ---
  modules/meta_engine/taglib.cpp | 15 ++++-----------

+ 2 - 2
MobileVLCKit/patches/0017-contrib-gcrypt-update-patches.patch

@@ -1,7 +1,7 @@
-From c330ccd238758e4eb2572b8b57b43ac7299de655 Mon Sep 17 00:00:00 2001
+From ddff4cfb3997c104a2bf95ddbba75c2c94e747ec 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 17/21] contrib/gcrypt: update patches
+Subject: [PATCH 17/22] contrib/gcrypt: update patches
 
 ---
  contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch  | 308 ++++++++++++++++++++-

+ 2 - 2
MobileVLCKit/patches/0018-deinterlace-merge-arm64-fix-linking-on-appleOS.patch

@@ -1,7 +1,7 @@
-From 868843d553c2659555050d0639d53d64a0e10abe Mon Sep 17 00:00:00 2001
+From 21299085e84aba831309baef5ef7fba353c98cc8 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 18/21] deinterlace-merge-arm64: fix linking on appleOS
+Subject: [PATCH 18/22] deinterlace-merge-arm64: fix linking on appleOS
 
 ---
  modules/arm_neon/asm64.S                       | 46 ++++++++++++++++++++++++++

+ 15 - 15
MobileVLCKit/patches/0019-ios2-vout-add-subpicture-rendering-in-the-zero-copy-.patch

@@ -1,7 +1,7 @@
-From b446f7dfd3e2fbd981b8cbb075a255cf99a8984b Mon Sep 17 00:00:00 2001
+From 32bf595d53a48e131f4d390d5b3eea5dca23f306 Mon Sep 17 00:00:00 2001
 From: Adrien Maglo <magsoft@videolan.org>
 Date: Fri, 16 Sep 2016 14:00:21 +0200
-Subject: [PATCH 19/21] ios2 vout: add subpicture rendering in the zero copy
+Subject: [PATCH 19/22] ios2 vout: add subpicture rendering in the zero copy
  pipeline
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 19/21] ios2 vout: add subpicture rendering in the zero copy
  1 file changed, 304 insertions(+), 34 deletions(-)
 
 diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
-index 5e56ca5..6d4f1f1 100644
+index 8fa4bc6..9362fc1 100644
 --- a/modules/video_output/ios2.m
 +++ b/modules/video_output/ios2.m
 @@ -46,6 +46,7 @@
@@ -106,7 +106,7 @@ index 5e56ca5..6d4f1f1 100644
  static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
  {
      VLC_UNUSED(gl);
-@@ -281,7 +329,7 @@ static int Open(vlc_object_t *this)
+@@ -284,7 +332,7 @@ static int Open(vlc_object_t *this)
  
          if (sys->zero_copy) {
              vd->pool = ZeroCopyPicturePool;
@@ -115,7 +115,7 @@ index 5e56ca5..6d4f1f1 100644
              vd->display = ZeroCopyDisplay;
          } else {
              vd->pool = PicturePool;
-@@ -325,6 +373,15 @@ void Close (vlc_object_t *this)
+@@ -328,6 +376,15 @@ void Close (vlc_object_t *this)
      vout_display_sys_t *sys = vd->sys;
  
      @autoreleasepool {
@@ -131,7 +131,7 @@ index 5e56ca5..6d4f1f1 100644
          if (sys->tapRecognizer) {
              [sys->tapRecognizer.view removeGestureRecognizer:sys->tapRecognizer];
              [sys->tapRecognizer release];
-@@ -356,7 +413,8 @@ void Close (vlc_object_t *this)
+@@ -359,7 +416,8 @@ void Close (vlc_object_t *this)
                  picture_pool_Release(sys->picturePool);
              sys->picturePool = NULL;
          }
@@ -141,7 +141,7 @@ index 5e56ca5..6d4f1f1 100644
          free(sys);
      }
  }
-@@ -548,11 +606,154 @@ static void DestroyZeroCopyPoolPicture(picture_t *picture)
+@@ -551,11 +609,154 @@ static void DestroyZeroCopyPoolPicture(picture_t *picture)
      free(picture);
  }
  
@@ -297,7 +297,7 @@ index 5e56ca5..6d4f1f1 100644
  }
  
  static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
-@@ -961,6 +1162,8 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
+@@ -970,6 +1171,8 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
  
      glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
  
@@ -306,7 +306,7 @@ index 5e56ca5..6d4f1f1 100644
      glBindRenderbuffer(GL_RENDERBUFFER, _renderBuffer);
      [_eaglContext presentRenderbuffer:GL_RENDERBUFFER];
  
-@@ -971,6 +1174,54 @@ done:
+@@ -980,6 +1183,54 @@ done:
      [EAGLContext setCurrentContext:previousContext];
  }
  
@@ -361,7 +361,7 @@ index 5e56ca5..6d4f1f1 100644
  - (void)setupZeroCopyGL
  {
      EAGLContext *previousContext = [EAGLContext currentContext];
-@@ -1017,55 +1268,59 @@ done:
+@@ -1026,55 +1277,59 @@ done:
  
  - (BOOL)loadShaders
  {
@@ -440,7 +440,7 @@ index 5e56ca5..6d4f1f1 100644
      }
  
      // Get uniform locations.
-@@ -1075,16 +1330,35 @@ done:
+@@ -1084,16 +1339,35 @@ done:
      uniforms[UNIFORM_TRANSFORM_MATRIX] = glGetUniformLocation(self.shaderProgram, "transformMatrix");
  
      // Release vertex and fragment shaders.
@@ -483,7 +483,7 @@ index 5e56ca5..6d4f1f1 100644
  }
  
  - (BOOL)compileShader:(GLuint *)shader type:(GLenum)type sourceString:sourceString
-@@ -1097,7 +1371,6 @@ done:
+@@ -1106,7 +1380,6 @@ done:
      glShaderSource(*shader, 1, &source, NULL);
      glCompileShader(*shader);
  
@@ -491,7 +491,7 @@ index 5e56ca5..6d4f1f1 100644
      GLint logLength;
      glGetShaderiv(*shader, GL_INFO_LOG_LENGTH, &logLength);
      if (logLength > 0) {
-@@ -1107,7 +1380,6 @@ done:
+@@ -1116,7 +1389,6 @@ done:
              msg_Dbg(_voutDisplay, "Shader compile log:\n%s", log);
          free(log);
      }
@@ -499,7 +499,7 @@ index 5e56ca5..6d4f1f1 100644
  
      glGetShaderiv(*shader, GL_COMPILE_STATUS, &status);
      if (status == 0) {
-@@ -1123,7 +1395,6 @@ done:
+@@ -1132,7 +1404,6 @@ done:
      GLint status;
      glLinkProgram(prog);
  
@@ -507,7 +507,7 @@ index 5e56ca5..6d4f1f1 100644
      GLint logLength;
      glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &logLength);
      if (logLength > 0) {
-@@ -1133,7 +1404,6 @@ done:
+@@ -1142,7 +1413,6 @@ done:
              msg_Dbg(_voutDisplay, "Program link log:\n%s", log);
          free(log);
      }

+ 8 - 8
MobileVLCKit/patches/0020-libvlc_media-add-cookie_jar-API.patch

@@ -1,7 +1,7 @@
-From fd5f77fbb997bfff3fa4de2e0a0cf5a9bfa12b92 Mon Sep 17 00:00:00 2001
+From c4143310b296c998d8af41b5193deb9eac9abf79 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
-Subject: [PATCH 20/21] libvlc_media: add cookie_jar API
+Subject: [PATCH 20/22] libvlc_media: add cookie_jar API
 
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
@@ -58,7 +58,7 @@ index 15933c5..beb1dd5 100644
  
  # ifdef __cplusplus
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index f297970..4dda39b 100644
+index 18eaea3..c6548c4 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
 @@ -215,6 +215,8 @@ libvlc_media_set_user_data
@@ -139,18 +139,18 @@ index f063ddb..17bbd84 100644
  
  /* Media Descriptor */
 diff --git a/lib/media_player.c b/lib/media_player.c
-index ac30787..fdda68a 100644
+index 1b87fd2..49529e5 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -601,6 +601,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
- 
-     /* Input */
+@@ -605,6 +605,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);
 +    var_Create (mp, "http-cookies", VLC_VAR_ADDRESS);
  
      /* Video */
      var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
-@@ -954,6 +955,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
+@@ -958,6 +959,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
          return -1;
      }
  

+ 3 - 3
MobileVLCKit/patches/0021-http-add-vlc_http_cookies_clear.patch

@@ -1,7 +1,7 @@
-From 70b8d428132968df8e40e4edb6741e03dcf78de3 Mon Sep 17 00:00:00 2001
+From 12f6d8f5bb7c77c294eb71b4ee13c936e1ff098f Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
-Subject: [PATCH 21/21] http: add vlc_http_cookies_clear
+Subject: [PATCH 21/22] http: add vlc_http_cookies_clear
 
 Clear all cookies without deleting the jar.
 ---
@@ -23,7 +23,7 @@ index ed7e161..da1fe4e 100644
  
  /**
 diff --git a/src/libvlccore.sym b/src/libvlccore.sym
-index 5a7de9e..bbf6ff8 100644
+index 8bb2dac..f7926ff 100644
 --- a/src/libvlccore.sym
 +++ b/src/libvlccore.sym
 @@ -137,6 +137,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader

+ 29 - 0
MobileVLCKit/patches/0022-videotoolbox-temporarily-disable-H263-decoding-on-iO.patch

@@ -0,0 +1,29 @@
+From a5f45dd75e90383c0cb9df539d1489f7fed33185 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
+Date: Thu, 22 Sep 2016 13:03:17 +0200
+Subject: [PATCH 22/22] videotoolbox: temporarily disable H263 decoding on iOS
+
+---
+ modules/codec/videotoolbox.m | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m
+index b21e0cc..f0ae37e 100644
+--- a/modules/codec/videotoolbox.m
++++ b/modules/codec/videotoolbox.m
+@@ -198,11 +198,11 @@ static CMVideoCodecType CodecPrecheck(decoder_t *p_dec)
+ 
+             break;
+         }
++#if !TARGET_OS_IPHONE
+         case VLC_CODEC_H263:
+             codec = kCMVideoCodecType_H263;
+             break;
+ 
+-#if !TARGET_OS_IPHONE
+             /* there are no DV or ProRes decoders on iOS, so bailout early */
+         case VLC_CODEC_PRORES:
+             /* the VT decoder can't differenciate between the ProRes flavors, so we do it */
+-- 
+2.9.3
+

+ 1 - 1
buildMobileVLCKit.sh

@@ -17,7 +17,7 @@ SCARY=yes
 TVOS=no
 BITCODE=no
 
-TESTEDHASH=11174e3a
+TESTEDHASH=28a9f978
 
 usage()
 {