libvlc: update to current stable hash

This adds support for the meson build system used for dav1d and therefore VLCKit requires python 3.7 now

This is a manual forward-port of 70c0f59d.

README.md

@@ -49,9 +49,10 @@ Here are some other common use-cases
 
 ## Requirements
 
-- iOS 8.0 + / macOS 10.9+ / tvOS 10.2+
+- iOS 8.4 + / macOS 10.9+ / tvOS 10.2+
 - Xcode 9.0+
 - Cocoapods 1.4+
+- python 3.7 (compile time only)
 
 ## Installation
 
@@ -70,17 +71,17 @@ source 'https://github.com/CocoaPods/Specs.git'
 
 target '<macOS Target>' do
     platform :macos, '10.9'
-    pod 'VLCKit', '3.1.2'
+    pod 'VLCKit', '3.1.4'
 end
 
 target '<iOS Target>' do
-    platform :ios, '8.0'
-    pod 'MobileVLCKit', '3.1.2'
+    platform :ios, '8.4'
+    pod 'MobileVLCKit', '3.1.4'
 end
 
 target '<tvOS Target>' do
     platform :tvos, '9.0'
-    pod 'TVVLCKit', '3.1.2'
+    pod 'TVVLCKit', '3.1.4'
 end
 ```
 
@@ -146,6 +147,8 @@ On iOS and tvOS, you also need to link:
 
 ### Default
 
+Make sure that python 3.7 is installed. Get the package from https://www.python.org - do NOT use homebrew for installation as it will be ignored by VLC's build process.
+
 Run `compileAndBuildVLCKit.sh` with the `-a ${ARCH}` option to specify the target architecture.
 
 More information can be found under `./compileAndBuildVLCKit.sh -h`

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

-From dc9c618b4c6688c6513b5cae8904e37c7e2660ac Mon Sep 17 00:00:00 2001
+From 64890108ef8aef81a9b6186ef8745ca569188826 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 01/24] arm_neon: work-around libtool issue
+Subject: [PATCH 01/26] arm_neon: work-around libtool issue
 
 ---
  modules/arm_neon/Makefile.am | 2 ++
@@ -18,5 +18,5 @@ index 10f5c15d7c..0406ded7eb 100644
  
  libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.19.1
+2.20.1
 

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

-From dbd9f620328f25116a4b566f35874716afacc0b5 Mon Sep 17 00:00:00 2001
+From 03ad0d48a5159a9124197b966915b5fed33497fa 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 02/24] disable neon volume plugin
+Subject: [PATCH 02/26] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -
@@ -20,5 +20,5 @@ index 0406ded7eb..48aa33332b 100644
  endif
  
 -- 
-2.19.1
+2.20.1
 

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

-From fd74fd58538a01d109f0f3a26df781e19c1fc528 Mon Sep 17 00:00:00 2001
+From d1c41dee6b96fef60e36adfc4515cb1916430b85 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 03/24] Enable System DL
+Subject: [PATCH 03/26] Enable System DL
 
 ---
  contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
@@ -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 fc68f815a0..4d2d716146 100644
+index 74ea2a5be6..0835f38b8d 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
 @@ -27,6 +27,9 @@ FFMPEGCONF = \
@@ -49,7 +49,7 @@ index fc68f815a0..4d2d716146 100644
  	--disable-debug \
  	--disable-avdevice \
  	--disable-devices \
-@@ -241,6 +244,7 @@ endif
+@@ -244,6 +247,7 @@ endif
  ifdef USE_LIBAV
  	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
  endif
@@ -58,5 +58,5 @@ index fc68f815a0..4d2d716146 100644
  
  .ffmpeg: ffmpeg
 -- 
-2.19.1
+2.20.1
 

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

-From 65a2faaf03bf4069e0b30c6ffd496a82f9deaa70 Mon Sep 17 00:00:00 2001
+From 3e4862b9283804a5e6ce73269095adb8d58e9579 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:10 +0200
-Subject: [PATCH 04/24] http: add vlc_http_cookies_clear
+Subject: [PATCH 04/26] http: add vlc_http_cookies_clear
 
 Clear all cookies without deleting the jar.
 ---
@@ -61,5 +61,5 @@ index 77ab852b15..f229b85dea 100644
  }
  
 -- 
-2.19.1
+2.20.1
 

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

-From 9f094b23210393814b6c6b58b412bf2535bfd7e7 Mon Sep 17 00:00:00 2001
+From de133ee95ebdad8e1f2fa70986d04524f714fc05 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Fri, 16 Sep 2016 15:51:11 +0200
-Subject: [PATCH 05/24] libvlc_media: add cookie_jar API
+Subject: [PATCH 05/26] libvlc_media: add cookie_jar API
 
 ---
  include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
@@ -163,5 +163,5 @@ index a9a22fee15..fde008aaeb 100644
  
      p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
 -- 
-2.19.1
+2.20.1
 

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

-From 6919eee7ec517745c48aec19e8b2d82ba14e9b85 Mon Sep 17 00:00:00 2001
+From b24dfc5e996d9650dd5caa4e7e29dba26ee44a49 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 06/24] contrib/gcrypt: work-around a libtool limitation
+Subject: [PATCH 06/26] contrib/gcrypt: work-around a libtool limitation
 
 ---
  contrib/src/gcrypt/rules.mak                  |  1 +
@@ -10,7 +10,7 @@ Subject: [PATCH 06/24] contrib/gcrypt: work-around a libtool limitation
  create mode 100644 contrib/src/gcrypt/work-around-libtool-limitation.patch
 
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 0e45004c30..4bc68ce60f 100644
+index ecc95be7c9..6697e6714f 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
 @@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.19.1
+2.20.1
 

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

-From 3cc76553965aac561acdca22134e039e186263cf Mon Sep 17 00:00:00 2001
+From 42fe1b30f4f4ffbe34f5d5fc19ee5c3f89c6600b 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 07/24] contrib/gcrypt: fix tvOS compilation
+Subject: [PATCH 07/26] contrib/gcrypt: fix tvOS compilation
 
 ---
  .../src/gcrypt/fix-sha1-ssse3-for-clang.patch    | 16 ++++++++++++++++
@@ -32,7 +32,7 @@ index 0000000000..f1d3ccc71f
 +    *	%rdi: ctx, CTX
 +    *	%rsi: data (64 bytes)
 diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
-index 4bc68ce60f..99e7e93dc6 100644
+index 6697e6714f..ca78585737 100644
 --- a/contrib/src/gcrypt/rules.mak
 +++ b/contrib/src/gcrypt/rules.mak
 @@ -13,6 +13,7 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
@@ -56,5 +56,5 @@ index 4bc68ce60f..99e7e93dc6 100644
  GCRYPT_CONF += --disable-aesni-support
  else
 -- 
-2.19.1
+2.20.1
 

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

-From 3471ea78bcb6ddf51cb110e4b2b721052e79dc18 Mon Sep 17 00:00:00 2001
+From 8fa0595eac3f94adfd0632f1221c3eb75240cbbc 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 08/24] contrib/gcrypt: update patches
+Subject: [PATCH 08/26] contrib/gcrypt: update patches
 
 ---
  .../src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 +++++++++++++++++-
@@ -363,5 +363,5 @@ index df97ffb488..957f268ad2 100644
   
   # Need to include ../src in addition to top_srcdir because gcrypt.h is
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0009-Replace-thread-local-with-pthread-TSD.patch

-From 511e7cc46089328eb0017ccb4a43af25b271a68e Mon Sep 17 00:00:00 2001
+From 882b0df73fe66f6548f0dcbea4aad13d076dad14 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Mon, 17 Jul 2017 17:03:24 +0200
-Subject: [PATCH 09/24] Replace thread local with pthread TSD
+Subject: [PATCH 09/26] Replace thread local with pthread TSD
 
 ---
  src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
@@ -222,5 +222,5 @@ index 810c8ffc81..3d2d2f1dc8 100644
      twalk(priv->var_root, TwalkGetNames);
      vlc_mutex_unlock(&priv->var_lock);
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0010-contrib-use-live555-version-that-is-compatible-with-.patch

-From ef3c9b20be99382ef6090f8318cd38736d212f76 Mon Sep 17 00:00:00 2001
+From e9bf297b30a286c26681dd733530b4d6a02d39d5 Mon Sep 17 00:00:00 2001
 From: Carola Nitz <nitz.carola@googlemail.com>
 Date: Fri, 29 Sep 2017 14:49:02 +0200
-Subject: [PATCH 10/24] contrib: use live555 version that is compatible with
+Subject: [PATCH 10/26] contrib: use live555 version that is compatible with
  LGPL2
 
 ---
@@ -18,7 +18,7 @@ index f459fb9d16..02b2a69734 100644
 +10846fd6d5482bbea131ae805137077997e9dec242665e3c01d699d5584154c65049e8c520ea855599e554154a148e61fea77b592d97c814a4a98c773658d8f5  live.2016.10.21.tar.gz
 \ No newline at end of file
 diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
-index e4ed5afb07..f99b7968a4 100644
+index bb1d5655c7..41fc1c6179 100644
 --- a/contrib/src/live555/rules.mak
 +++ b/contrib/src/live555/rules.mak
 @@ -1,14 +1,12 @@
@@ -46,5 +46,5 @@ index e4ed5afb07..f99b7968a4 100644
  		echo "PREFIX = $(PREFIX)" >> $$subdir/Makefile.head && \
  		echo "LIBDIR = $(PREFIX)/lib" >> $$subdir/Makefile.head ; done
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0011-libvlc-add-a-basic-API-to-change-freetype-s-color-bo.patch

-From 7f6b852bf67d88d07cb694778251d35d0a864185 Mon Sep 17 00:00:00 2001
+From 68e12bd41f54948d9e70526767394687057243fd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
 Date: Sun, 17 Dec 2017 18:05:40 +0100
-Subject: [PATCH 11/24] libvlc: add a basic API to change freetype's color,
+Subject: [PATCH 11/26] libvlc: add a basic API to change freetype's color,
  bold, font and size variables on-the-fly
 
 ---
@@ -182,7 +182,7 @@ index acbba3a30f..035cc0ebf1 100644
 +    return get_string( p_mi, "freetype", textrenderer_option_bynumber(option) );
 +}
 diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
-index b92c66ceac..fb1469a6ea 100644
+index b92c66ceac..ce7bd61806 100644
 --- a/modules/text_renderer/freetype/freetype.c
 +++ b/modules/text_renderer/freetype/freetype.c
 @@ -952,12 +952,36 @@ static inline int RenderAXYZ( filter_t *p_filter,
@@ -227,5 +227,5 @@ index b92c66ceac..fb1469a6ea 100644
  
  static void FillDefaultStyles( filter_t *p_filter )
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0012-Work-around-lack-of-__thread-storage-qualifier-on-ol.patch

-From a01e2597158342b2959e3b541e09cc55f3f3e1ff Mon Sep 17 00:00:00 2001
+From c7fa4b11280181e7e70ff7d59b3e435223fa1342 Mon Sep 17 00:00:00 2001
 From: Carola Nitz <nitz.carola@googlemail.com>
 Date: Fri, 23 Feb 2018 13:16:41 +0100
-Subject: [PATCH 12/24] Work around lack of __thread storage qualifier on old
+Subject: [PATCH 12/26] Work around lack of __thread storage qualifier on old
  macOS
 
 ---
@@ -14,7 +14,7 @@ Subject: [PATCH 12/24] Work around lack of __thread storage qualifier on old
  rename {compat => src/extras}/tdestroy.c (59%)
 
 diff --git a/configure.ac b/configure.ac
-index a6ff64595e..b9c2a95c20 100644
+index b29079ac58..32a45bac65 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -591,8 +591,8 @@ dnl Check for system libs needed
@@ -204,5 +204,5 @@ index 6bb3480957..5c54881553 100644
 +
 +#endif
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0013-modules-common-Use-the-full-module-name-as-MODULE_NA.patch

-From bc504873674615f71711747d67103f5f11126930 Mon Sep 17 00:00:00 2001
+From c43ac7a5c3bb40f8828d460d84166ad17616a615 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
 Date: Mon, 26 Mar 2018 16:44:44 +0200
-Subject: [PATCH 13/24] modules:common: Use the full module name as MODULE_NAME
+Subject: [PATCH 13/26] modules:common: Use the full module name as MODULE_NAME
 
 This avoid conflicts when linking modules staticly on platforms that don't
 have objdump
@@ -29,5 +29,5 @@ index 1b9117c98d..fc67a39bca 100644
  AM_CFLAGS =
  AM_CXXFLAGS =
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0014-add-auto-deinterlacer-mode-which-is-also-valid.patch

-From ff9698b3306cc13be988e27f5c75a7d9f20356d6 Mon Sep 17 00:00:00 2001
+From 432a13a097b951873c8d874af0fad37771e5301c Mon Sep 17 00:00:00 2001
 From: Luis Fernandes <zipleen@gmail.com>
 Date: Mon, 30 Apr 2018 14:33:08 +0100
-Subject: [PATCH 14/24] add auto deinterlacer-mode which is also valid
+Subject: [PATCH 14/26] add auto deinterlacer-mode which is also valid
 
 ---
  lib/video.c | 3 ++-
@@ -22,5 +22,5 @@ index 035cc0ebf1..a3e5b248e9 100644
  
      if (*psz_mode)
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0015-Users-will-be-able-to-change-the-deinterlace-mode-wi.patch

-From 1109ec892424828fe9b66cd24faddabe355ab476 Mon Sep 17 00:00:00 2001
+From 712b67bfd1a0826ca25fd0c1dc8a03c8d8a57bf2 Mon Sep 17 00:00:00 2001
 From: Luis Fernandes <zipleen@gmail.com>
 Date: Wed, 9 May 2018 10:44:43 +0100
-Subject: [PATCH 15/24] Users will be able to change the deinterlace mode
+Subject: [PATCH 15/26] Users will be able to change the deinterlace mode
  without forcing it.
 
 ---
@@ -87,5 +87,5 @@ index a3e5b248e9..9bc0f634f5 100644
      }
      free (pp_vouts);
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0016-contrib-ffmpeg-enable-videotoolbox-encoder.patch

-From 5c4577a56a56756f6a30b42b5d724f0ef715c35c Mon Sep 17 00:00:00 2001
+From 90f1eb3dc688384f43a82fc49bfab5530008439f Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 27 Mar 2018 16:49:34 +0200
-Subject: [PATCH 16/24] contrib: ffmpeg: enable videotoolbox encoder
+Subject: [PATCH 16/26] contrib: ffmpeg: enable videotoolbox encoder
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,10 +15,10 @@ Signed-off-by: Felix Paul Kühne <felix@feepk.net>
  1 file changed, 1 deletion(-)
 
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 4d2d716146..7a3b678370 100644
+index 0835f38b8d..2837616642 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
-@@ -50,7 +50,6 @@ FFMPEGCONF += \
+@@ -51,7 +51,6 @@ FFMPEGCONF += \
  	--disable-linux-perf
  ifdef HAVE_DARWIN_OS
  FFMPEGCONF += \
@@ -27,5 +27,5 @@ index 4d2d716146..7a3b678370 100644
  endif
  endif
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0017-chromecast-use-vt-encoder-from-avcodec.patch

-From 3d85f8a44eb9d1d7781ab1c71a0c308f0ebc9ab9 Mon Sep 17 00:00:00 2001
+From 855cff247d0a55638f1946fcd7d9758d1ad7a452 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Tue, 27 Mar 2018 16:52:35 +0200
-Subject: [PATCH 17/24] chromecast: use vt encoder from avcodec
+Subject: [PATCH 17/26] chromecast: use vt encoder from avcodec
 
 ---
  modules/stream_out/chromecast/cast.cpp | 13 +++++++++++++
  1 file changed, 13 insertions(+)
 
 diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
-index 53227c258b..60edf28e82 100644
+index 5d2aefc139..ab40a04c66 100644
 --- a/modules/stream_out/chromecast/cast.cpp
 +++ b/modules/stream_out/chromecast/cast.cpp
-@@ -954,12 +954,25 @@ static std::string GetVencX264Option( sout_stream_t * /* p_stream */,
+@@ -950,12 +950,25 @@ static std::string GetVencX264Option( sout_stream_t * /* p_stream */,
      return ssout.str();
  }
  
@@ -38,5 +38,5 @@ index 53227c258b..60edf28e82 100644
      { .fcc = VLC_CODEC_VP8,  .get_opt = GetVencVPXOption },
      { .fcc = VLC_CODEC_H264, .get_opt = NULL },
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0018-ffmpeg-backport-vtenc-patches.patch

-From 87cd7de678ddb793468bd64cbdd0a73158bcc524 Mon Sep 17 00:00:00 2001
+From 349a07bff41310f005b72891a5b9cd26ff1981d5 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Mon, 18 Jun 2018 12:31:13 +0200
-Subject: [PATCH 18/24] ffmpeg: backport vtenc patches
+Subject: [PATCH 18/26] ffmpeg: backport vtenc patches
 
 ---
  ...lboxenc-fix-mutex-cond-leak-in-error.patch |  35 ++++++
@@ -340,10 +340,10 @@ index 0000000000..42f4cce1e6
 +2.18.0
 +
 diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
-index 7a3b678370..7c3a87068c 100644
+index 2837616642..59d8b1e8a5 100644
 --- a/contrib/src/ffmpeg/rules.mak
 +++ b/contrib/src/ffmpeg/rules.mak
-@@ -239,6 +239,10 @@ ifdef USE_FFMPEG
+@@ -242,6 +242,10 @@ ifdef USE_FFMPEG
  	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
  	$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch
  	$(APPLY) $(SRC)/ffmpeg/h264_early_SAR.patch
@@ -355,5 +355,5 @@ index 7a3b678370..7c3a87068c 100644
  ifdef USE_LIBAV
  	$(APPLY) $(SRC)/ffmpeg/libav_gsm.patch
 -- 
-2.19.1
+2.20.1
 

Resources/MobileVLCKit/patches/0019-core-expose-config_AutoSaveConfigFile.patch

-From b1b5cc357d7bea99b2839d1d3ece0e32ae29617a Mon Sep 17 00:00:00 2001
+From cf0f351691b8d6666d718d13c3648f1f6d6e2167 Mon Sep 17 00:00:00 2001
 From: Thomas Guillem <thomas@gllm.fr>
 Date: Wed, 17 Jan 2018 10:06:13 +0200
-Subject: [PATCH 19/24] core: expose config_AutoSaveConfigFile
+Subject: [PATCH 19/26] core: expose config_AutoSaveConfigFile
 
 ---
  include/vlc_configuration.h | 2 ++
@@ -60,5 +60,5 @@ index db7f4030b9..4ad59b1fc0 100644
  config_ChainDestroy
  config_ChainDuplicate
 -- 
-2.19.1
+2.20.1