Commit f8779f5d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Rebase patches

parent 9a25af90
From fc1067c623ec972c7877b8dbbe04bb230f3f3293 Mon Sep 17 00:00:00 2001
From 8c5f388c4f963a210cf4313932e2e27f396f9067 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/22] arm_neon: added function macro to handle the underscore
Subject: [PATCH 01/20] arm_neon: added function macro to handle the underscore
prefix for the iOS ARM ABI
---
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.9.3
2.9.2
From f635ebee207353481c224d20e016994330a33105 Mon Sep 17 00:00:00 2001
From 672fc4120bf481fe70454980c8f085b647850619 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/22] deinterlace/merge: use a macro to fix compilation for
Subject: [PATCH 02/20] deinterlace/merge: use a macro to fix compilation for
iOS
---
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.9.3
2.9.2
From 9f83a47ea417de4409499f7d56e7609f35139efb Mon Sep 17 00:00:00 2001
From 21878d1bee0585d7d91f6d78ac179ef00dd2dfe8 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/22] lib/media player: inherit deinterlace variable to
Subject: [PATCH 03/20] lib/media player: inherit deinterlace variable to
achieve correct value on first use
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 03/22] 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 9a8f73a..4a7e2b8 100644
index ba7554c..74a4f85 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -644,7 +644,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -22,5 +22,5 @@ index 9a8f73a..4a7e2b8 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.9.3
2.9.2
From c1382d874e3622df136e6a008d3920730fe754a8 Mon Sep 17 00:00:00 2001
From e4c0c332a8dedf3597f31ab22c6712ddb4821829 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/22] arm_neon: work-around libtool issue
Subject: [PATCH 04/20] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.9.3
2.9.2
From d8f2aac3c9ccdd60fd20f54d0833954be7c00c5f Mon Sep 17 00:00:00 2001
From 137650b56dd6482ae66ed5ea8961e2a3f091c045 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/22] arm_neon: fix iOS linking
Subject: [PATCH 05/20] arm_neon: fix iOS linking
---
modules/arm_neon/amplify.S | 7 ++---
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.9.3
2.9.2
From cfd9874858c34a0d1426eed5f8789269863a2e60 Mon Sep 17 00:00:00 2001
From 6392a926d6ac6db42282d19ec96a0e4650dd6c50 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/22] disable neon volume plugin
Subject: [PATCH 06/20] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.9.3
2.9.2
From 8fa1ef9dbb9a27617e59de4b13cabe30b2c53ebe Mon Sep 17 00:00:00 2001
From 3a1366f45f2f51ecc99edeb4975f32638dad10df 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/22] libvlc: expose a base set of freetype options to
Subject: [PATCH 07/20] libvlc: expose a base set of freetype options to
overwrite the default font
---
......@@ -14,10 +14,10 @@ Subject: [PATCH 09/22] 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 9a73b4f..b768844 100644
index 038e254..4835ffb 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1527,6 +1527,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -1570,6 +1570,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 9a73b4f..b768844 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 84e7189..18eaea3 100644
index caa5598..5262ebc 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -256,6 +256,9 @@ libvlc_video_get_spu_count
@@ -257,6 +257,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 84e7189..18eaea3 100644
libvlc_video_get_title_description
libvlc_video_get_track
libvlc_video_get_track_count
@@ -280,6 +283,9 @@ libvlc_video_set_spu
@@ -281,6 +284,9 @@ libvlc_video_set_spu
libvlc_video_set_spu_delay
libvlc_video_set_subtitle_file
libvlc_video_set_teletext
......@@ -73,9 +73,9 @@ index 84e7189..18eaea3 100644
+libvlc_video_set_textrenderer_string
libvlc_video_set_track
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
libvlc_video_new_viewpoint
diff --git a/lib/media_player.c b/lib/media_player.c
index 4a7e2b8..029e5cc 100644
index 74a4f85..3f95c27 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -674,6 +674,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -92,10 +92,10 @@ index 4a7e2b8..029e5cc 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 8655a32..dc13b7e 100644
index 0c5948f..8b02398 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -636,7 +636,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
@@ -678,7 +678,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 8655a32..dc13b7e 100644
unsigned type;
} opt_t;
@@ -665,6 +665,9 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
@@ -707,6 +707,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 8655a32..dc13b7e 100644
default:
libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
return;
@@ -688,6 +691,8 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
@@ -730,6 +733,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 8655a32..dc13b7e 100644
default:
libvlc_printerr( "Invalid argument to %s in %s", name, "get int" );
return 0;
@@ -911,3 +916,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -953,3 +958,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
{
return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
}
......@@ -314,5 +314,5 @@ index 44b2731..7f1abec 100644
/**
--
2.9.3
2.9.2
From 51c8f0bf8899aac4532ad89c1c19bba7835c4894 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/22] src/misc: fix compilation for OS without fork()
---
src/misc/cpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 28f127a..bacf842 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -63,7 +63,7 @@ static uint32_t cpu_flags;
#if defined (__i386__) || defined (__x86_64__) || defined (__powerpc__) \
|| defined (__ppc__) || defined (__ppc64__) || defined (__powerpc64__)
-# if !defined (_WIN32) && !defined (__OS2__)
+# if !defined (_WIN32) && !defined (__OS2__) && !defined (__APPLE__)
static bool vlc_CPU_check (const char *name, void (*func) (void))
{
pid_t pid = fork();
--
2.9.3
From 7ba81810fbb333efb1644921e7f8797936eefcb6 Mon Sep 17 00:00:00 2001
From 6faeb67c48e9d2381a89444941418e0298bd717f 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/22] libvlc: create VT-zero-copy variable
Subject: [PATCH 08/20] 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 029e5cc..fded5ed 100644
index 3f95c27..930190c 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -626,6 +626,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -20,5 +20,5 @@ index 029e5cc..fded5ed 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.9.3
2.9.2
From 8c335f6a6ddfd0584c8dc804e03b37011b45fb10 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/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 d3ce702..8cdc0bc 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -196,6 +196,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
goto error;
}
+#ifdef __APPLE__
+#undef HAVE_DAEMON
+#endif
+
#ifdef HAVE_DAEMON
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.9.3
From 72f9f62f6c3dd2d113234da647a561e3e28080bc Mon Sep 17 00:00:00 2001
From 71607e5f16d5524eaf1cafc77762e8f5cd90e50b 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/22] contrib/gcrypt: work-around a libtool limitation
Subject: [PATCH 09/20] contrib/gcrypt: work-around a libtool limitation
---
contrib/src/gcrypt/rules.mak | 1 +
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.9.3
2.9.2
From 4b7193dc3733a7aaecbde2f0321992600edbebec Mon Sep 17 00:00:00 2001
From 67a4db4298c280c5ea5dd280ba1d4004b983b8cd 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/22] contrib/gcrypt: fix tvOS compilation
Subject: [PATCH 10/20] contrib/gcrypt: fix tvOS compilation
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 16 ++++++++++++++++
......@@ -56,5 +56,5 @@ index 1484e7a..200a98e 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.9.3
2.9.2
From 06e9b29cd099676065eed2e582c49b46a758a0fc Mon Sep 17 00:00:00 2001
From 02fa6267385b1a920ffa617b82418f55ec23e313 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/22] contrib/avcodec: enforce use of FFmpeg
Subject: [PATCH 11/20] 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 e4178c6..4dba6f8 100644
index 367bc49..e23727e 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -22,8 +22,8 @@ index e4178c6..4dba6f8 100644
-FFMPEG_HASH=HEAD
+FFMPEG_HASH=9157ac2f
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
else
--
2.9.3
2.9.2
From 2ea66aba3d4a7be74b093ba6bb9a970939aeb45f Mon Sep 17 00:00:00 2001
From 60655df0945aa9197105d9060c318b55fda74496 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/22] Enable System DL
Subject: [PATCH 12/20] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......@@ -36,7 +36,7 @@ index 0000000..2d60cf7
+ 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 4dba6f8..b4ce531 100644
index e23727e..ae32c97 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -22,6 +22,9 @@ FFMPEGCONF = \
......@@ -49,7 +49,7 @@ index 4dba6f8..b4ce531 100644
--disable-debug \
--disable-avdevice \
--disable-devices \
@@ -216,6 +219,7 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg
@@ -221,6 +224,7 @@ ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg
rm -Rf $@ $@-$(FFMPEG_HASH)
mkdir -p $@-$(FFMPEG_HASH)
$(XZCAT) "$<" | (cd $@-$(FFMPEG_HASH) && tar xv --strip-components=1)
......@@ -58,5 +58,5 @@ index 4dba6f8..b4ce531 100644
.ffmpeg: ffmpeg
--
2.9.3
2.9.2
From 52471fa7a441d46a7b49ec0bd7961cf52ffa98dc Mon Sep 17 00:00:00 2001
From 3e82429d30dc343767574dd91a32452ae9147664 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/22] Add AC-3 pass-through
Subject: [PATCH 13/20] Add AC-3 pass-through
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
......@@ -16,10 +16,10 @@ Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
5 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 1528861..66077d5 100755
index 7825e7d..c91add1 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -460,8 +460,6 @@ speex_resampler
@@ -466,8 +466,6 @@ speex_resampler
remoteosd
magnify
gradient
......@@ -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 b768844..17d2894 100644
index 4835ffb..a8a9b6e 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1862,6 +1862,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
@@ -1905,6 +1905,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 );
/**
......@@ -77,7 +77,7 @@ index 3aed6f5..094cc02 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 fded5ed..1b87fd2 100644
index 930190c..52f7f77 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -645,6 +645,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -89,10 +89,10 @@ index fded5ed..1b87fd2 100644
var_Create (mp, "deinterlace-mode", VLC_VAR_STRING);
diff --git a/modules/audio_output/audiounit_ios.m b/modules/audio_output/audiounit_ios.m
index cee8eab..0aa9dee 100644
index 3f591ce..9ecd1dc 100644
--- a/modules/audio_output/audiounit_ios.m
+++ b/modules/audio_output/audiounit_ios.m
@@ -201,16 +201,34 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
@@ -204,16 +204,34 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
if (status != noErr)
msg_Warn(p_aout, "failed to set IO mode (%i)", (int)status);
......@@ -133,7 +133,7 @@ index cee8eab..0aa9dee 100644
streamDescription.mBytesPerFrame = streamDescription.mBitsPerChannel * streamDescription.mChannelsPerFrame / 8;
streamDescription.mBytesPerPacket = streamDescription.mBytesPerFrame * streamDescription.mFramesPerPacket;
i_param_size = sizeof(streamDescription);
@@ -265,10 +283,11 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
@@ -268,10 +286,11 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
}
/* setup circular buffer */
......@@ -150,5 +150,5 @@ index cee8eab..0aa9dee 100644
/* Set audio session to mediaplayback */
NSError *error = nil;
--
2.9.3
2.9.2
From abf868b5a10c854ab1b850649b9a3e9843c78243 Mon Sep 17 00:00:00 2001
From d76b7a5622247128471fa3b88cf3e5a350c0e20c 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/22] taglib: DO NOT PUSH: works with networks accesses
Subject: [PATCH 14/20] taglib: DO NOT PUSH: works with networks accesses
---
modules/meta_engine/taglib.cpp | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 4e5df57..cdae73c 100644
index 6d051ba..ea3744d 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -174,7 +174,7 @@ public:
......@@ -20,7 +20,7 @@ index 4e5df57..cdae73c 100644
}
ByteVector readBlock(ulong length)
@@ -826,16 +826,8 @@ static int ReadMeta( vlc_object_t* p_this)
@@ -835,16 +835,8 @@ static int ReadMeta( vlc_object_t* p_this)
if( unlikely(psz_uri == NULL) )
return VLC_ENOMEM;
......@@ -39,7 +39,7 @@ index 4e5df57..cdae73c 100644
free( psz_uri );
if( p_stream == NULL )
return VLC_EGENERIC;
@@ -843,6 +835,7 @@ static int ReadMeta( vlc_object_t* p_this)
@@ -852,6 +844,7 @@ static int ReadMeta( vlc_object_t* p_this)
VlcIostream s( p_stream );
f = FileRef( &s );
#else /* VLC_WINSTORE_APP */
......@@ -48,5 +48,5 @@ index 4e5df57..cdae73c 100644
if( psz_path == NULL )
return VLC_EGENERIC;
--
2.9.3
2.9.2
From 6d54b0ec683af255f8b4b302613d39e78a072060 Mon Sep 17 00:00:00 2001
From 1092b0306aac2e3f7cad6766dfb853800298b36b 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/22] contrib/gcrypt: update patches
Subject: [PATCH 15/20] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
......@@ -363,5 +363,5 @@ index df97ffb..957f268 100644
# Need to include ../src in addition to top_srcdir because gcrypt.h is
--
2.9.3
2.9.2
From 0e15b5e37fd75aac9bc1c2d8106c1f7e9499446f Mon Sep 17 00:00:00 2001
From 85ed289f068d4cf143bbafee558039fece59815c 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/22] deinterlace-merge-arm64: fix linking on appleOS
Subject: [PATCH 16/20] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
......@@ -62,7 +62,7 @@ index 0000000..d778163
+.endm
+
diff --git a/modules/video_filter/deinterlace/merge_arm64.S b/modules/video_filter/deinterlace/merge_arm64.S
index ad898a3..27b662d 100644
index db19e54..63c04d3 100644
--- a/modules/video_filter/deinterlace/merge_arm64.S
+++ b/modules/video_filter/deinterlace/merge_arm64.S
@@ -19,6 +19,8 @@
......@@ -87,7 +87,7 @@ index ad898a3..27b662d 100644
ands x5, SIZE, #~63
b.eq 2f
mov x10, #64
@@ -65,11 +64,9 @@ merge8_arm64_neon:
@@ -64,11 +63,9 @@ merge8_arm64_neon:
st1 {v0.16b}, [DEST]
4:
ret
......@@ -101,11 +101,11 @@ index ad898a3..27b662d 100644
ands x5, SIZE, #~63
b.eq 2f
1:
@@ -100,3 +97,4 @@ merge16_arm64_neon:
@@ -99,3 +96,4 @@ merge16_arm64_neon:
st1 {v0.8h}, [DEST]
4:
ret
+endfunc
--
2.9.3
2.9.2
From 9d63c46d361e3d19cd5a0b74805b1a4a3da4c00b Mon Sep 17 00:00:00 2001
From d4c681fdac5dbeae0a13dd8c5ce3fccf304b19f6 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/22] ios2 vout: add subpicture rendering in the zero copy
Subject: [PATCH 17/20] ios2 vout: add subpicture rendering in the zero copy
pipeline
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 19/22] 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 797c615..6ca5caf 100644
index a47941f..d341626 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -46,6 +46,7 @@
......@@ -106,7 +106,7 @@ index 797c615..6ca5caf 100644
static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
{
VLC_UNUSED(gl);
@@ -284,7 +332,7 @@ static int Open(vlc_object_t *this)
@@ -285,7 +333,7 @@ static int Open(vlc_object_t *this)
if (sys->zero_copy) {
vd->pool = ZeroCopyPicturePool;
......@@ -115,7 +115,7 @@ index 797c615..6ca5caf 100644
vd->display = ZeroCopyDisplay;
} else {
vd->pool = PicturePool;
@@ -328,6 +376,15 @@ void Close (vlc_object_t *this)
@@ -329,6 +377,15 @@ void Close (vlc_object_t *this)
vout_display_sys_t *sys = vd->sys;
@autoreleasepool {
......@@ -131,7 +131,7 @@ index 797c615..6ca5caf 100644
if (sys->tapRecognizer) {
[sys->tapRecognizer.view removeGestureRecognizer:sys->tapRecognizer];
[sys->tapRecognizer release];
@@ -359,7 +416,8 @@ void Close (vlc_object_t *this)
@@ -360,7 +417,8 @@ void Close (vlc_object_t *this)
picture_pool_Release(sys->picturePool);
sys->picturePool = NULL;
}
......@@ -141,7 +141,7 @@ index 797c615..6ca5caf 100644
free(sys);
}
}
@@ -551,11 +609,154 @@ static void DestroyZeroCopyPoolPicture(picture_t *picture)
@@ -556,11 +614,154 @@ static void DestroyZeroCopyPoolPicture(picture_t *picture)
free(picture);
}
......@@ -297,7 +297,7 @@ index 797c615..6ca5caf 100644
}
static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)