Commit 27425075 authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: update libvlc to HEAD

parent 1216faa5
From a061a62ae0465717d796aa1532370c8dcd0c23e2 Mon Sep 17 00:00:00 2001
From 1e4daafcf88c5784b046621dd03630af865bcecb 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/17] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/19] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -65,5 +65,5 @@ index 0000000000..d853255fec
+.endm
+
--
2.11.0
2.13.2
From 076ac14102d238ca11e855772f07c6ff921db6fc Mon Sep 17 00:00:00 2001
From 82cca4d4e6ec00ee3095e491af42bb23fb9ee40d 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/17] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/19] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd779029ae..03e5042b28 100644
b 1b
+endfunc
--
2.11.0
2.13.2
From 3b965e0b2f369c0c28df1b598c090320b3ac11e2 Mon Sep 17 00:00:00 2001
From 740d331f33d77be696674b79ed036ea287a244a8 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/17] arm_neon: work-around libtool issue
Subject: [PATCH 03/19] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......@@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.11.0
2.13.2
From c58bdd653853056d3e290c2362d56dcc4e718308 Mon Sep 17 00:00:00 2001
From 37b5438993733e3c6007ac5a0144267b64d97b96 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/17] arm_neon: fix iOS linking
Subject: [PATCH 04/19] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......@@ -194,5 +194,5 @@ index a94ae8539f..54b43a79e3 100644
pop {r4,pc}
+endfunc
--
2.11.0
2.13.2
From a0019d3e79fb4fe453156aa376e440f629a953d7 Mon Sep 17 00:00:00 2001
From 4dd37452c0a8d9894e78b31999251bb9f80c3642 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/17] disable neon volume plugin
Subject: [PATCH 05/19] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......@@ -19,5 +19,5 @@ index e67e07e61c..690975235f 100644
libyuv_rgb_neon_plugin.la
endif
--
2.11.0
2.13.2
From 0414fa99437e71a13114446848d087e60cd92a38 Mon Sep 17 00:00:00 2001
From da015892c1793885fd4e030988cfa3e9d921984e 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/17] libvlc: create VT-zero-copy variable
Subject: [PATCH 06/19] libvlc: create VT-zero-copy variable
---
lib/media_player.c | 1 +
......@@ -20,5 +20,5 @@ index dc17f7765d..dde84ab7c6 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.11.0
2.13.2
From 2be3b715533e501857003e8276e336cf60fe39a2 Mon Sep 17 00:00:00 2001
From f3d83d8373a8b6440d3a78231ef1aeb11cd48802 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 08/17] Enable System DL
Subject: [PATCH 07/19] 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 c37d463706..29b2f6c878 100644
index 41d16a4fb2..3e5f910e99 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -24,6 +24,9 @@ FFMPEGCONF = \
......@@ -58,5 +58,5 @@ index c37d463706..29b2f6c878 100644
.ffmpeg: ffmpeg
--
2.11.0
2.13.2
From f840c7cbd8d479b4d203cc14f3a8618c9970cab2 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 07/17] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index eabf605179..c37d463706 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
#Uncomment the one you want
#USE_LIBAV ?= 1
-#USE_FFMPEG ?= 1
+USE_FFMPEG ?= 1
ifdef USE_FFMPEG
-FFMPEG_HASH=0768aaec1d683226e613e692080a588359c31334
+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
--
2.11.0
From cfcf84e696ea96474186335dd3e6a8e8fd2bfdaa Mon Sep 17 00:00:00 2001
From 05c1deb1bd3550e76d381e5eaa6184eb82e6b579 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 09/17] deinterlace-merge-arm64: fix linking on appleOS
Subject: [PATCH 08/19] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
......@@ -107,5 +107,5 @@ index db19e54caf..63c04d3fdd 100644
ret
+endfunc
--
2.11.0
2.13.2
From f3adbf5e030f329301fe8d1242b2782b9904d449 Mon Sep 17 00:00:00 2001
From b973b13bedb1362bc12fc500a5057cbdcbc414e4 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 10/17] http: add vlc_http_cookies_clear
Subject: [PATCH 09/19] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......@@ -23,10 +23,10 @@ index ed7e1613da..da1fe4ef1a 100644
/**
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index bc21ee682c..f82b9599b8 100644
index d8649afe1b..70a8d7cd28 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -127,6 +127,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
@@ -130,6 +130,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
vlc_http_auth_FormatAuthorizationHeader
vlc_http_cookies_new
vlc_http_cookies_destroy
......@@ -61,5 +61,5 @@ index 2e4d3a8663..0929758f62 100644
}
--
2.11.0
2.13.2
From 9b675f6b64a900b914eca8d497ff1d35378ad96f Mon Sep 17 00:00:00 2001
From 76dcf904cf9b82457fe48d85650b7660fd6ddf72 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 11/17] libvlc_media: add cookie_jar API
Subject: [PATCH 10/19] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......@@ -163,5 +163,5 @@ index dde84ab7c6..c99fabf940 100644
p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
--
2.11.0
2.13.2
From a27ff1b88e446d12ba718479aa60cf0863c3675a Mon Sep 17 00:00:00 2001
From c8a434012c3cccbb551c1755f204ac6260d4df00 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 18 Apr 2017 17:24:03 +0200
Subject: [PATCH 12/17] Revert "Contribs: update libpng to 1.6.29"
Subject: [PATCH 11/19] Revert "Contribs: update libpng to 1.6.29"
This reverts commit 8891af2d84de3caa5c4f2a51acbb2b47647ed62d.
---
......@@ -58,5 +58,5 @@ index 9a05170afc..c18cfdf214 100644
PKGS += png
--
2.11.0
2.13.2
From 695757ddf69b3d985e40f45b405efc84fb797562 Mon Sep 17 00:00:00 2001
From 2ef35a22e30df3ea9399f0c57db2e2cb950853de 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 14/17] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 12/19] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -10,11 +10,11 @@ Subject: [PATCH 14/17] 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 a7cbd8a3bd..bfb8e4e341 100644
index eff80415a1..c2d4b934f4 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
+ $(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
......@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.11.0
2.13.2
From 007e4b71510d385b85470f5e3368bea3e389a4b0 Mon Sep 17 00:00:00 2001
From 32e4af99ed1e9d44e447c247363bcc63740a1d26 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 15/17] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 13/19] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -32,10 +32,10 @@ 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 bfb8e4e341..60ba2b725e 100644
index c2d4b934f4..dbd556be61 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -13,6 +13,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
@@ -13,6 +13,7 @@ gcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
$(UNPACK)
$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
$(APPLY) $(SRC)/gcrypt/work-around-libtool-limitation.patch
......@@ -56,5 +56,5 @@ index bfb8e4e341..60ba2b725e 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.11.0
2.13.2
From 326564e66ebd2809b5ffde9d9b1576931468a265 Mon Sep 17 00:00:00 2001
From ddddf2d9ce20c43a0dbc2ac7801ff13637e07651 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 16/17] contrib/gcrypt: update patches
Subject: [PATCH 14/19] contrib/gcrypt: update patches
---
contrib/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.11.0
2.13.2
From 51db444d84bc5b5167a557d929e37e81206bbdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:05:51 +0200
Subject: [PATCH 15/19] contrib/avcodec: enforce use of FFmpeg
---
contrib/src/ffmpeg/rules.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3e5f910e99..6acb5da740 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,7 +2,7 @@
#Uncomment the one you want
#USE_LIBAV ?= 1
-#USE_FFMPEG ?= 1
+USE_FFMPEG ?= 1
ifdef USE_FFMPEG
FFMPEG_HASH=a82468514048fb87d9bf38689866bc3b9aaccd02
--
2.13.2
From b7e264ca4871ab48b6c53ea7e73bda27cda5aa46 Mon Sep 17 00:00:00 2001
From 2bf1a280c10db4aa4199e404285622946b603eae Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 11 Apr 2017 15:15:26 +0200
Subject: [PATCH 13/17] build: rename exported symbols by module
Subject: [PATCH 16/19] build: rename exported symbols by module
This is quite ugly and temporary. Ideally we should rename symbols in binaries
like the Android script do.
This is quite ugly and temporary. Ideally we should rename symbols in binaries like the Android script do.
---
modules/codec/ttml/ttml.c | 2 +-
modules/codec/ttml/ttml.h | 4 ++--
......@@ -18,7 +17,7 @@ like the Android script do.
9 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
index cb9b4b6066..69b6ee9d2c 100644
index 4727b28cbf..97631276e5 100644
--- a/modules/codec/ttml/ttml.c
+++ b/modules/codec/ttml/ttml.c
@@ -54,7 +54,7 @@ vlc_module_begin ()
......@@ -46,7 +45,7 @@ index 51f41126f9..5781a92a34 100644
int OpenDecoder ( vlc_object_t * );
void CloseDecoder ( vlc_object_t * );
diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index 616c670ca8..a7822a4a61 100644
index 28c5a7df76..29cd5b144f 100644
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -41,7 +41,7 @@ vlc_module_begin ()
......@@ -58,7 +57,7 @@ index 616c670ca8..a7822a4a61 100644
set_section( N_("Demuxer"), NULL )
add_string( "avformat-format", NULL, FORMAT_TEXT, FORMAT_LONGTEXT, true )
add_obsolete_string("ffmpeg-format") /* removed since 2.1.0 */
@@ -59,7 +59,7 @@ vlc_module_begin ()
@@ -57,7 +57,7 @@ vlc_module_begin ()
add_string( "sout-avformat-mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
add_obsolete_string("ffmpeg-mux") /* removed since 2.1.0 */
add_string( "sout-avformat-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
......@@ -89,11 +88,11 @@ index 5105dd1efd..7c97fc842a 100644
#define MUX_TEXT N_("Avformat mux")
#define MUX_LONGTEXT N_("Force use of a specific avformat muxer.")
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 1dd0976ee3..ae01aa5711 100644
index 0d299a93d8..fa14e532bb 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -152,7 +152,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
#endif
@@ -143,7 +143,7 @@ static void get_rotation(es_format_t *fmt, AVStream *s)
}
}
-int OpenDemux( vlc_object_t *p_this )
......@@ -101,7 +100,7 @@ index 1dd0976ee3..ae01aa5711 100644
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
@@ -290,7 +290,7 @@ int OpenDemux( vlc_object_t *p_this )
@@ -280,7 +280,7 @@ int OpenDemux( vlc_object_t *p_this )
if( !p_io_buffer )
{
free( psz_url );
......@@ -110,7 +109,7 @@ index 1dd0976ee3..ae01aa5711 100644
return VLC_ENOMEM;
}
@@ -299,7 +299,7 @@ int OpenDemux( vlc_object_t *p_this )
@@ -289,7 +289,7 @@ int OpenDemux( vlc_object_t *p_this )
{
av_free( p_io_buffer );
free( psz_url );
......@@ -119,7 +118,7 @@ index 1dd0976ee3..ae01aa5711 100644
return VLC_ENOMEM;
}
@@ -309,7 +309,7 @@ int OpenDemux( vlc_object_t *p_this )
@@ -299,7 +299,7 @@ int OpenDemux( vlc_object_t *p_this )
{
av_free( p_io_buffer );
free( psz_url );
......@@ -128,7 +127,7 @@ index 1dd0976ee3..ae01aa5711 100644
return VLC_ENOMEM;
}
@@ -324,7 +324,7 @@ int OpenDemux( vlc_object_t *p_this )
@@ -314,7 +314,7 @@ int OpenDemux( vlc_object_t *p_this )
av_free( pb );
p_sys->ic = NULL;
free( psz_url );
......@@ -137,7 +136,7 @@ index 1dd0976ee3..ae01aa5711 100644
return VLC_EGENERIC;
}
free( psz_url );
@@ -688,7 +688,7 @@ int OpenDemux( vlc_object_t *p_this )
@@ -665,7 +665,7 @@ int OpenDemux( vlc_object_t *p_this )
/*****************************************************************************
* Close
*****************************************************************************/
......@@ -147,7 +146,7 @@ index 1dd0976ee3..ae01aa5711 100644
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 59a423525c..152ac2983d 100644
index f339af312c..52d0baf16a 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -84,7 +84,7 @@ static int IOWriteTyped(void *opaque, uint8_t *buf, int buf_size,
......@@ -197,7 +196,7 @@ index 146d129ff8..fa480e4cf9 100644
demux_sys_t* p_sys = p_demux->p_sys;
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 5e56eb88e0..2d76ced861 100644
index 1397aed9b8..31103f3631 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -113,7 +113,7 @@ vlc_module_begin ()
......@@ -218,16 +217,16 @@ index 5e56eb88e0..2d76ced861 100644
*/
static const char *const ppsz_filter_options[] = {
"mode", "phosphor-chroma", "phosphor-dimmer",
@@ -275,7 +275,7 @@ static void GetOutputFormat( filter_t *p_filter,
#define DEINTERLACE_DST_SIZE 3
@@ -239,7 +239,7 @@ static void GetOutputFormat( filter_t *p_filter,
* video filter functions
*****************************************************************************/
-/* This is the filter function. See Open(). */
+/* This is the filter function. See Open__deinterlace(). */
picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic )
{
filter_sys_t *p_sys = p_filter->p_sys;
@@ -596,10 +596,10 @@ int Mouse( filter_t *p_filter,
return DoDeinterlacing( p_filter, &p_filter->p_sys->context, p_pic );
@@ -273,10 +273,10 @@ int Mouse( filter_t *p_filter,
/*****************************************************************************
......@@ -241,10 +240,10 @@ index 5e56eb88e0..2d76ced861 100644
filter_t *p_filter = (filter_t*)p_this;
filter_sys_t *p_sys;
diff --git a/modules/video_filter/deinterlace/deinterlace.h b/modules/video_filter/deinterlace/deinterlace.h
index 618db45e7c..669f62ff34 100644
index ecc26e0d60..0c71cda6d2 100644
--- a/modules/video_filter/deinterlace/deinterlace.h
+++ b/modules/video_filter/deinterlace/deinterlace.h
@@ -130,7 +130,7 @@ struct filter_sys_t
@@ -92,7 +92,7 @@ struct filter_sys_t
/**
* Top-level filtering method.
*
......@@ -253,7 +252,7 @@ index 618db45e7c..669f62ff34 100644
* in the filter structure.
*
* Note that there is no guarantee that the returned picture directly
@@ -164,7 +164,7 @@ struct filter_sys_t
@@ -126,7 +126,7 @@ struct filter_sys_t
* @param p_filter The filter instance.
* @param p_pic The latest input picture.
* @return Deinterlaced picture(s). Linked list of picture_t's or NULL.
......@@ -262,7 +261,7 @@ index 618db45e7c..669f62ff34 100644
* @see filter_t
* @see filter_sys_t
*/
@@ -180,7 +180,7 @@ picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
@@ -142,7 +142,7 @@ picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
* wants to convert the output to a format different
* from the input. See SetFilterMethod().
*
......@@ -271,7 +270,7 @@ index 618db45e7c..669f62ff34 100644
* is left as it was before the call to this function.
*
* @param p_this The filter instance as vlc_object_t.
@@ -191,17 +191,17 @@ picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
@@ -153,17 +153,17 @@ picture_t *Deinterlace( filter_t *p_filter, picture_t *p_pic );
* @see IsChromaSupported()
* @see SetFilterMethod()
*/
......@@ -292,7 +291,7 @@ index 618db45e7c..669f62ff34 100644
* @see filter_t
* @see filter_sys_t
* @see metadata_history_t
@@ -213,7 +213,7 @@ void Flush( filter_t *p_filter );
@@ -175,7 +175,7 @@ void Flush( filter_t *p_filter );
/**
* Mouse callback for the deinterlace filter.
*
......@@ -301,7 +300,7 @@ index 618db45e7c..669f62ff34 100644
* in the filter structure.
*
* Currently, this handles the scaling of the y coordinate for algorithms
@@ -225,7 +225,7 @@ void Flush( filter_t *p_filter );
@@ -187,7 +187,7 @@ void Flush( filter_t *p_filter );
* @param[in] p_new Latest mouse position data.
* @return VLC error code; currently always VLC_SUCCESS.
* @retval VLC_SUCCESS All ok.
......@@ -310,7 +309,7 @@ index 618db45e7c..669f62ff34 100644
* @see filter_t
* @see vlc_mouse_t
*/
@@ -276,7 +276,7 @@ void Close( vlc_object_t *p_this );
@@ -238,7 +238,7 @@ void Close( vlc_object_t *p_this );
* but the new value will only take effect upon the next call to Deinterlace()
* (i.e. at the next incoming frame).
*
......@@ -320,5 +319,5 @@ index 618db45e7c..669f62ff34 100644
* frames, each algorithm is responsible for setting the offset correctly.
* (The default is 0, so if that is correct, there's no need to do anything.)
--
2.11.0
2.13.2
From 9e4426bba569c34b6f0de0e0fd815fe537df2c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 17/19] Remove thread local
---
src/misc/interrupt.c | 2 +-
src/misc/variables.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
index 3fafaa4183..02e1049c4b 100644
--- a/src/misc/interrupt.c
+++ b/src/misc/interrupt.c
@@ -43,7 +43,7 @@
#include "interrupt.h"
#include "libvlc.h"
-static thread_local vlc_interrupt_t *vlc_interrupt_var;
+static vlc_interrupt_t *vlc_interrupt_var;
/**
* Initializes an interruption context.
diff --git a/src/misc/variables.c b/src/misc/variables.c
index d441684c06..c1544836b2 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -1378,7 +1378,7 @@ void DumpVariables(vlc_object_t *obj)
vlc_mutex_unlock(&vlc_internals(obj)->var_lock);
}
-static thread_local void *twalk_ctx;
+static vlc_threadvar_t *twalk_ctx;
static void TwalkGetNames(const void *data, const VISIT which, const int depth)
{
--
2.13.2
From a8a9f64d358be38fb5f5a0a85cbd4652a84a9321 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 2 Jun 2017 15:56:34 +0200
Subject: [PATCH 17/17] core: Fix TLS usage
TLS is not implement on arm ios (for iPhone5). We may drop this platform for
4.0, so this patch is only temporary.
---
src/misc/variables.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/misc/variables.c b/src/misc/variables.c
index 121ef5ea70..3e7b43f912 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -1378,7 +1378,7 @@ void DumpVariables(vlc_object_t *obj)
vlc_mutex_unlock(&vlc_internals(obj)->var_lock);
}
-static _Thread_local void *twalk_ctx;