Commit 16e074d2 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

MVK: update libvlc

parent 51543e06
From 8c5f388c4f963a210cf4313932e2e27f396f9067 Mon Sep 17 00:00:00 2001
From 937b0c10f9d9067a8cfec4dbcdc8ee6f2effd34c 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/20] arm_neon: added function macro to handle the underscore
......@@ -11,7 +11,7 @@ Subject: [PATCH 01/20] arm_neon: added function macro to handle the underscore
diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S
new file mode 100644
index 0000000..d853255
index 0000000000..d853255fec
--- /dev/null
+++ b/modules/arm_neon/asm.S
@@ -0,0 +1,49 @@
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.9.2
2.11.0
From 672fc4120bf481fe70454980c8f085b647850619 Mon Sep 17 00:00:00 2001
From 9ea1ec7836433363945401e18ec5fb46c5e0cb00 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/20] deinterlace/merge: use a macro to fix compilation for
......@@ -9,7 +9,7 @@ Subject: [PATCH 02/20] deinterlace/merge: use a macro to fix compilation for
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/modules/video_filter/deinterlace/merge_arm.S b/modules/video_filter/deinterlace/merge_arm.S
index dd77902..03e5042 100644
index dd779029ae..03e5042b28 100644
--- a/modules/video_filter/deinterlace/merge_arm.S
+++ b/modules/video_filter/deinterlace/merge_arm.S
@@ -18,6 +18,8 @@
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.9.2
2.11.0
From 21878d1bee0585d7d91f6d78ac179ef00dd2dfe8 Mon Sep 17 00:00:00 2001
From 9fcb8c71ced449b40bd835a941a9a4ea91577bd4 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/20] lib/media player: inherit deinterlace variable to
......@@ -9,7 +9,7 @@ Subject: [PATCH 03/20] 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 ba7554c..74a4f85 100644
index ba7554c092..74a4f85931 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 ba7554c..74a4f85 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.9.2
2.11.0
From e4c0c332a8dedf3597f31ab22c6712ddb4821829 Mon Sep 17 00:00:00 2001
From cdfc2a009b3c0b8ff8ab6a487dc9c8cd2a6d22cf 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/20] arm_neon: work-around libtool issue
......@@ -8,7 +8,7 @@ Subject: [PATCH 04/20] arm_neon: work-around libtool issue
1 file changed, 2 insertions(+)
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index db81ec0..e67e07e 100644
index db81ec0b84..e67e07e61c 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -1,3 +1,5 @@
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.9.2
2.11.0
From 137650b56dd6482ae66ed5ea8961e2a3f091c045 Mon Sep 17 00:00:00 2001
From e29316915b36db46c54ad03559c76f8371e195aa 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/20] arm_neon: fix iOS linking
......@@ -9,7 +9,7 @@ Subject: [PATCH 05/20] arm_neon: fix iOS linking
2 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/modules/arm_neon/amplify.S b/modules/arm_neon/amplify.S
index 5938118..42f0d00 100644
index 5938118378..42f0d004d8 100644
--- a/modules/arm_neon/amplify.S
+++ b/modules/arm_neon/amplify.S
@@ -18,6 +18,8 @@
......@@ -38,7 +38,7 @@ index 5938118..42f0d00 100644
bx lr
+endfunc
diff --git a/modules/arm_neon/simple_channel_mixer.S b/modules/arm_neon/simple_channel_mixer.S
index a94ae85..54b43a7 100644
index a94ae8539f..54b43a79e3 100644
--- a/modules/arm_neon/simple_channel_mixer.S
+++ b/modules/arm_neon/simple_channel_mixer.S
@@ -19,6 +19,8 @@
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.9.2
2.11.0
From 6392a926d6ac6db42282d19ec96a0e4650dd6c50 Mon Sep 17 00:00:00 2001
From d5456d8e58984daaffbf6ccdd5361947c9f02f37 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/20] disable neon volume plugin
......@@ -8,7 +8,7 @@ Subject: [PATCH 06/20] disable neon volume plugin
1 file changed, 1 deletion(-)
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index e67e07e..6909752 100644
index e67e07e61c..690975235f 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -27,6 +27,5 @@ libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.9.2
2.11.0
From 3a1366f45f2f51ecc99edeb4975f32638dad10df Mon Sep 17 00:00:00 2001
From 2eee3a5fdd791b705b2fb5c185a0827e07b4e58d 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 07/20] libvlc: expose a base set of freetype options to
......@@ -14,10 +14,10 @@ Subject: [PATCH 07/20] 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 038e254..4835ffb 100644
index b6e697e621..8cfb8a2663 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1570,6 +1570,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -1569,6 +1569,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,7 +51,7 @@ index 038e254..4835ffb 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index caa5598..5262ebc 100644
index caa55981bf..5262ebcc13 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -257,6 +257,9 @@ libvlc_video_get_spu_count
......@@ -75,7 +75,7 @@ index caa5598..5262ebc 100644
libvlc_video_take_snapshot
libvlc_video_new_viewpoint
diff --git a/lib/media_player.c b/lib/media_player.c
index 74a4f85..3f95c27 100644
index 74a4f85931..3f95c27c39 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 74a4f85..3f95c27 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 0c5948f..8b02398 100644
index 46f9935025..b7638b30fe 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -678,7 +678,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
@@ -676,7 +676,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 0c5948f..8b02398 100644
unsigned type;
} opt_t;
@@ -707,6 +707,9 @@ set_int( libvlc_media_player_t *p_mi, const char *restrict name,
@@ -705,6 +705,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 0c5948f..8b02398 100644
default:
libvlc_printerr( "Invalid argument to %s in %s", name, "set int" );
return;
@@ -730,6 +733,8 @@ get_int( libvlc_media_player_t *p_mi, const char *restrict name,
@@ -728,6 +731,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 0c5948f..8b02398 100644
default:
libvlc_printerr( "Invalid argument to %s in %s", name, "get int" );
return 0;
@@ -953,3 +958,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -951,3 +956,64 @@ float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
{
return get_float( p_mi, "adjust", adjust_option_bynumber(option) );
}
......@@ -189,10 +189,10 @@ index 0c5948f..8b02398 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 c75770a..66a4b62 100644
index 6baf45f91b..25c965067a 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -77,6 +77,9 @@
@@ -78,6 +78,9 @@
*****************************************************************************/
static int Create ( vlc_object_t * );
static void Destroy( vlc_object_t * );
......@@ -202,7 +202,7 @@ index c75770a..66a4b62 100644
#define FONT_TEXT N_("Font")
#define MONOSPACE_FONT_TEXT N_("Monospace Font")
@@ -929,7 +932,7 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -930,7 +933,7 @@ static void FillDefaultStyles( filter_t *p_filter )
{
filter_sys_t *p_sys = p_filter->p_sys;
......@@ -211,7 +211,7 @@ index c75770a..66a4b62 100644
p_sys->p_default_style->psz_monofontname = var_InheritString( p_filter, "freetype-monofont" );
p_sys->p_default_style->i_font_alpha = var_InheritInteger( p_filter,"freetype-opacity" );
@@ -937,6 +940,8 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -938,6 +941,8 @@ static void FillDefaultStyles( filter_t *p_filter )
p_sys->p_default_style->i_font_color = var_InheritInteger( p_filter,"freetype-color" );
p_sys->p_default_style->i_font_color = VLC_CLIP( p_sys->p_default_style->i_font_color, 0, 0xFFFFFF );
......@@ -220,7 +220,7 @@ index c75770a..66a4b62 100644
p_sys->p_default_style->i_outline_alpha = var_InheritInteger( p_filter, "freetype-outline-opacity" );
p_sys->p_default_style->i_outline_alpha = VLC_CLIP( p_sys->p_default_style->i_outline_alpha, 0, 255 );
p_sys->p_default_style->i_outline_color = var_InheritInteger( p_filter, "freetype-outline-color" );
@@ -952,11 +957,11 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -953,11 +958,11 @@ static void FillDefaultStyles( filter_t *p_filter )
p_sys->p_default_style->i_features |= STYLE_HAS_FLAGS;
p_sys->p_forced_style->i_font_size = var_InheritInteger( p_filter, "freetype-fontsize" );
......@@ -234,7 +234,7 @@ index c75770a..66a4b62 100644
{
p_sys->p_forced_style->i_style_flags |= STYLE_BOLD;
p_sys->p_forced_style->i_features |= STYLE_HAS_FLAGS;
@@ -964,6 +969,12 @@ static void FillDefaultStyles( filter_t *p_filter )
@@ -965,6 +970,12 @@ static void FillDefaultStyles( filter_t *p_filter )
/* Apply forced styles to defaults, if any */
text_style_Merge( p_sys->p_default_style, p_sys->p_forced_style, true );
......@@ -247,7 +247,7 @@ index c75770a..66a4b62 100644
}
static void FreeStylesArray( text_style_t **pp_styles, size_t i_styles )
@@ -1326,6 +1337,17 @@ static void Destroy( vlc_object_t *p_this )
@@ -1327,6 +1338,17 @@ static void Destroy( vlc_object_t *p_this )
DumpDictionary( p_filter, &p_sys->fallback_map, true, -1 );
#endif
......@@ -265,7 +265,7 @@ index c75770a..66a4b62 100644
/* Attachments */
if( p_sys->pp_font_attachments )
{
@@ -1355,3 +1377,34 @@ static void Destroy( vlc_object_t *p_this )
@@ -1356,3 +1378,34 @@ static void Destroy( vlc_object_t *p_this )
free( p_sys );
}
......@@ -301,7 +301,7 @@ index c75770a..66a4b62 100644
+ return VLC_SUCCESS;
+}
diff --git a/modules/text_renderer/freetype/freetype.h b/modules/text_renderer/freetype/freetype.h
index 44b2731..7f1abec 100644
index 44b2731c8c..7f1abeca04 100644
--- a/modules/text_renderer/freetype/freetype.h
+++ b/modules/text_renderer/freetype/freetype.h
@@ -137,6 +137,8 @@ struct filter_sys_t
......@@ -314,5 +314,5 @@ index 44b2731..7f1abec 100644
/**
--
2.9.2
2.11.0
From 6faeb67c48e9d2381a89444941418e0298bd717f Mon Sep 17 00:00:00 2001
From 95792e45dec1bba78c8c07645d3cc8f82c8d82e4 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 08/20] libvlc: create VT-zero-copy variable
......@@ -8,7 +8,7 @@ Subject: [PATCH 08/20] libvlc: create VT-zero-copy variable
1 file changed, 1 insertion(+)
diff --git a/lib/media_player.c b/lib/media_player.c
index 3f95c27..930190c 100644
index 3f95c27c39..930190cd55 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 3f95c27..930190c 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.9.2
2.11.0
From 71607e5f16d5524eaf1cafc77762e8f5cd90e50b Mon Sep 17 00:00:00 2001
From 3baf211bf3ebf096047f090074ae8262c10fc426 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 09/20] contrib/gcrypt: work-around a libtool limitation
......@@ -10,7 +10,7 @@ Subject: [PATCH 09/20] 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 291f0fc..1484e7a 100644
index 291f0fc1b5..1484e7ab82 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -12,6 +12,7 @@ $(TARBALLS)/libgcrypt-$(GCRYPT_VERSION).tar.bz2:
......@@ -23,7 +23,7 @@ index 291f0fc..1484e7a 100644
endif
diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
new file mode 100644
index 0000000..df97ffb
index 0000000000..df97ffb488
--- /dev/null
+++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
@@ -0,0 +1,25 @@
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.9.2
2.11.0
From 67a4db4298c280c5ea5dd280ba1d4004b983b8cd Mon Sep 17 00:00:00 2001
From 4ca5a43c588b61d5c7f231eca13d5e3d4a426d45 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 10/20] contrib/gcrypt: fix tvOS compilation
......@@ -11,7 +11,7 @@ Subject: [PATCH 10/20] contrib/gcrypt: fix tvOS compilation
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
new file mode 100644
index 0000000..f1d3ccc
index 0000000000..f1d3ccc71f
--- /dev/null
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -0,0 +1,16 @@
......@@ -32,7 +32,7 @@ index 0000000..f1d3ccc
+ * %rdi: ctx, CTX
+ * %rsi: data (64 bytes)
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 1484e7a..200a98e 100644
index 1484e7ab82..200a98e828 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
......@@ -56,5 +56,5 @@ index 1484e7a..200a98e 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.9.2
2.11.0
From 02fa6267385b1a920ffa617b82418f55ec23e313 Mon Sep 17 00:00:00 2001
From fb8d6688f6acd9ba2dcb0abc7457eff57d3dc058 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 11/20] contrib/avcodec: enforce use of FFmpeg
......@@ -8,7 +8,7 @@ Subject: [PATCH 11/20] 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 367bc49..e23727e 100644
index 367bc49868..e23727e2c9 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -25,5 +25,5 @@ index 367bc49..e23727e 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
else
--
2.9.2
2.11.0
From 60655df0945aa9197105d9060c318b55fda74496 Mon Sep 17 00:00:00 2001
From 482a63a267812ba6421cc94a610de9d295cbbbf5 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 12/20] Enable System DL
......@@ -11,7 +11,7 @@ Subject: [PATCH 12/20] Enable System DL
diff --git a/contrib/src/ffmpeg/patch-as-patch-can.patch b/contrib/src/ffmpeg/patch-as-patch-can.patch
new file mode 100644
index 0000000..2d60cf7
index 0000000000..2d60cf7140
--- /dev/null
+++ b/contrib/src/ffmpeg/patch-as-patch-can.patch
@@ -0,0 +1,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 e23727e..ae32c97 100644
index e23727e2c9..ae32c97616 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -22,6 +22,9 @@ FFMPEGCONF = \
......@@ -58,5 +58,5 @@ index e23727e..ae32c97 100644
.ffmpeg: ffmpeg
--
2.9.2
2.11.0
From 3e82429d30dc343767574dd91a32452ae9147664 Mon Sep 17 00:00:00 2001
From fb01c554826a50e09433d058186c600163231e23 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Tue, 1 Mar 2016 16:31:13 +0100
Subject: [PATCH 13/20] Add AC-3 pass-through
......@@ -16,7 +16,7 @@ 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 7825e7d..c91add1 100755
index b680033529..7485eb539c 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -466,8 +466,6 @@ speex_resampler
......@@ -29,10 +29,10 @@ index 7825e7d..c91add1 100755
visual
fb
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 4835ffb..a8a9b6e 100644
index 8cfb8a2663..3da63bfe27 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1905,6 +1905,16 @@ LIBVLC_API int64_t libvlc_audio_get_delay( libvlc_media_player_t *p_mi );
@@ -1904,6 +1904,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,7 +50,7 @@ index 4835ffb..a8a9b6e 100644
*
* \return number of presets
diff --git a/lib/audio.c b/lib/audio.c
index 3aed6f5..094cc02 100644
index 3aed6f5ff3..094cc023d8 100644
--- a/lib/audio.c
+++ b/lib/audio.c
@@ -473,6 +473,22 @@ int libvlc_audio_set_channel( libvlc_media_player_t *mp, int channel )
......@@ -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 930190c..52f7f77 100644
index 930190cd55..52f7f777b4 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -645,6 +645,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -89,7 +89,7 @@ index 930190c..52f7f77 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 3f591ce..9ecd1dc 100644
index 3f591ce2ee..9ecd1dc603 100644
--- a/modules/audio_output/audiounit_ios.m
+++ b/modules/audio_output/audiounit_ios.m
@@ -204,16 +204,34 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
......@@ -150,5 +150,5 @@ index 3f591ce..9ecd1dc 100644
/* Set audio session to mediaplayback */
NSError *error = nil;
--
2.9.2
2.11.0
From d76b7a5622247128471fa3b88cf3e5a350c0e20c Mon Sep 17 00:00:00 2001
From d9610d5c0eb20d91c3bc7cb37fbdab9ae917c8bf Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 22 Jul 2016 11:20:24 +0200
Subject: [PATCH 14/20] taglib: DO NOT PUSH: works with networks accesses
......@@ -8,7 +8,7 @@ Subject: [PATCH 14/20] taglib: DO NOT PUSH: works with networks accesses
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 6d051ba..ea3744d 100644
index 6d051ba1ea..ea3744da29 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -174,7 +174,7 @@ public:
......@@ -48,5 +48,5 @@ index 6d051ba..ea3744d 100644
if( psz_path == NULL )
return VLC_EGENERIC;
--
2.9.2
2.11.0
From 1092b0306aac2e3f7cad6766dfb853800298b36b Mon Sep 17 00:00:00 2001
From 9654fc52d92167a344188d02a0e9cdb064f62bd6 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 15/20] contrib/gcrypt: update patches
......@@ -9,7 +9,7 @@ Subject: [PATCH 15/20] contrib/gcrypt: update patches
2 files changed, 310 insertions(+), 14 deletions(-)
diff --git a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
index f1d3ccc..21d7a30 100644
index f1d3ccc71f..21d7a30c8d 100644
--- a/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -1,16 +1,312 @@
......@@ -332,7 +332,7 @@ index f1d3ccc..21d7a30 100644
- * %rsi: data (64 bytes)
+ * %rsi: data (64*nblks bytes)
diff --git a/contrib/src/gcrypt/work-around-libtool-limitation.patch b/contrib/src/gcrypt/work-around-libtool-limitation.patch
index df97ffb..957f268 100644
index df97ffb488..957f268ad2 100644
--- a/contrib/src/gcrypt/work-around-libtool-limitation.patch
+++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
@@ -1,18 +1,18 @@
......@@ -363,5 +363,5 @@ index df97ffb..957f268 100644
# Need to include ../src in addition to top_srcdir because gcrypt.h is
--
2.9.2
2.11.0
From 85ed289f068d4cf143bbafee558039fece59815c Mon Sep 17 00:00:00 2001
From 21d9cfe8ca718a380a32f12145cbd137d4c17df7 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 16/20] deinterlace-merge-arm64: fix linking on appleOS
......@@ -11,7 +11,7 @@ Subject: [PATCH 16/20] deinterlace-merge-arm64: fix linking on appleOS
diff --git a/modules/arm_neon/asm64.S b/modules/arm_neon/asm64.S
new file mode 100644
index 0000000..d778163
index 0000000000..d77816312b
--- /dev/null
+++ b/modules/arm_neon/asm64.S
@@ -0,0 +1,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 db19e54..63c04d3 100644
index db19e54caf..63c04d3fdd 100644
--- a/modules/video_filter/deinterlace/merge_arm64.S
+++ b/modules/video_filter/deinterlace/merge_arm64.S
@@ -19,6 +19,8 @@
......@@ -107,5 +107,5 @@ index db19e54..63c04d3 100644
ret
+endfunc
--
2.9.2
2.11.0
From d4c681fdac5dbeae0a13dd8c5ce3fccf304b19f6 Mon Sep 17 00:00:00 2001
From f9251ea08de5c4d1442e6283f0938953e5c417de Mon Sep 17 00:00:00 2001
From: Adrien Maglo <magsoft@videolan.org>
Date: Fri, 16 Sep 2016 14:00:21 +0200
Subject: [PATCH 17/20] ios2 vout: add subpicture rendering in the zero copy
......@@ -9,7 +9,7 @@ Subject: [PATCH 17/20] 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 a47941f..d341626 100644
index d99b91d8bc..e235c6146c 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -46,6 +46,7 @@
......@@ -106,7 +106,7 @@ index a47941f..d341626 100644
static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
{
VLC_UNUSED(gl);
@@ -285,7 +333,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 a47941f..d341626 100644
vd->display = ZeroCopyDisplay;
} else {
vd->pool = PicturePool;
@@ -329,6 +377,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 a47941f..d341626 100644
if (sys->tapRecognizer) {
[sys->tapRecognizer.view removeGestureRecognizer:sys->tapRecognizer];
[sys->tapRecognizer release];
@@ -360,7 +417,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 a47941f..d341626 100644
free(sys);
}
}
@@ -556,11 +614,154 @@ static void DestroyZeroCopyPoolPicture(picture_t *picture)
@@ -561,11 +619,154 @@ static void DestroyZeroCopyPoolPicture(picture_t *picture)
free(picture);
}
......@@ -297,7 +297,7 @@ index a47941f..d341626 100644
}
static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
@@ -981,6 +1182,8 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
@@ -986,6 +1187,8 @@ static void ZeroCopyDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *su
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);