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

MobileVLCKit: update libvlc

parent e153c7e9
From 937b0c10f9d9067a8cfec4dbcdc8ee6f2effd34c Mon Sep 17 00:00:00 2001
From 53365c2f3ac0941b9bf23a667b013f904f141a5d 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 0000000000..d853255fec
index 0000000..d853255
--- /dev/null
+++ b/modules/arm_neon/asm.S
@@ -0,0 +1,49 @@
......@@ -65,5 +65,5 @@ index 0000000000..d853255fec
+.endm
+
--
2.11.0
2.9.3
From 9ea1ec7836433363945401e18ec5fb46c5e0cb00 Mon Sep 17 00:00:00 2001
From 4cf215ca65d9167a32449a2fe35c98d5c87021bf 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 dd779029ae..03e5042b28 100644
index dd77902..03e5042 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 dd779029ae..03e5042b28 100644
b 1b
+endfunc
--
2.11.0
2.9.3
From 9fcb8c71ced449b40bd835a941a9a4ea91577bd4 Mon Sep 17 00:00:00 2001
From 360931e098edf051fdb714ae56381ca3662ea368 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 ba7554c092..74a4f85931 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 ba7554c092..74a4f85931 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.11.0
2.9.3
From cdfc2a009b3c0b8ff8ab6a487dc9c8cd2a6d22cf Mon Sep 17 00:00:00 2001
From 8e9175d91ef79c36e7dfc4f4dfe87bb76feb70f6 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 db81ec0b84..e67e07e61c 100644
index db81ec0..e67e07e 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -1,3 +1,5 @@
......@@ -18,5 +18,5 @@ index db81ec0b84..e67e07e61c 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.11.0
2.9.3
From e29316915b36db46c54ad03559c76f8371e195aa Mon Sep 17 00:00:00 2001
From 54e426acdccda0ac8b4286ff57c6ad9fa8985681 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 5938118378..42f0d004d8 100644
index 5938118..42f0d00 100644
--- a/modules/arm_neon/amplify.S
+++ b/modules/arm_neon/amplify.S
@@ -18,6 +18,8 @@
......@@ -38,7 +38,7 @@ index 5938118378..42f0d004d8 100644
bx lr
+endfunc
diff --git a/modules/arm_neon/simple_channel_mixer.S b/modules/arm_neon/simple_channel_mixer.S
index a94ae8539f..54b43a79e3 100644
index a94ae85..54b43a7 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 a94ae8539f..54b43a79e3 100644
pop {r4,pc}
+endfunc
--
2.11.0
2.9.3
From d5456d8e58984daaffbf6ccdd5361947c9f02f37 Mon Sep 17 00:00:00 2001
From 12e8f25559d0230035fe738a0d1e47d3714b344a 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 e67e07e61c..690975235f 100644
index e67e07e..6909752 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 e67e07e61c..690975235f 100644
libyuv_rgb_neon_plugin.la
endif
--
2.11.0
2.9.3
From 2eee3a5fdd791b705b2fb5c185a0827e07b4e58d Mon Sep 17 00:00:00 2001
From 2cff9f0db83a1f0fbde9e4ac73cc05e5b700944b 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,7 +14,7 @@ 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 b6e697e621..8cfb8a2663 100644
index b6e697e..8cfb8a2 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1569,6 +1569,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
......@@ -51,7 +51,7 @@ index b6e697e621..8cfb8a2663 100644
/** \defgroup libvlc_audio LibVLC audio controls
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index caa55981bf..5262ebcc13 100644
index caa5598..5262ebc 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -257,6 +257,9 @@ libvlc_video_get_spu_count
......@@ -75,7 +75,7 @@ index caa55981bf..5262ebcc13 100644
libvlc_video_take_snapshot
libvlc_video_new_viewpoint
diff --git a/lib/media_player.c b/lib/media_player.c
index 74a4f85931..3f95c27c39 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,7 +92,7 @@ index 74a4f85931..3f95c27c39 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 46f9935025..b7638b30fe 100644
index 46f9935..b7638b3 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -676,7 +676,7 @@ static bool find_sub_source_by_name( libvlc_media_player_t *p_mi, const char *re
......@@ -189,7 +189,7 @@ index 46f9935025..b7638b30fe 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 6baf45f91b..25c965067a 100644
index 6baf45f..25c9650 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -78,6 +78,9 @@
......@@ -301,7 +301,7 @@ index 6baf45f91b..25c965067a 100644
+ return VLC_SUCCESS;
+}
diff --git a/modules/text_renderer/freetype/freetype.h b/modules/text_renderer/freetype/freetype.h
index 44b2731c8c..7f1abeca04 100644
index 44b2731..7f1abec 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 44b2731c8c..7f1abeca04 100644
/**
--
2.11.0
2.9.3
From 95792e45dec1bba78c8c07645d3cc8f82c8d82e4 Mon Sep 17 00:00:00 2001
From 84f01e73780cbd9ef42370c4b4ab089397e1a640 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 3f95c27c39..930190cd55 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 3f95c27c39..930190cd55 100644
#ifdef __ANDROID__
var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
--
2.11.0
2.9.3
From 3baf211bf3ebf096047f090074ae8262c10fc426 Mon Sep 17 00:00:00 2001
From c0a6f13a5d0f8f789f0e422747f3132e669fb419 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 291f0fc1b5..1484e7ab82 100644
index 291f0fc..1484e7a 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 291f0fc1b5..1484e7ab82 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 0000000000..df97ffb488
index 0000000..df97ffb
--- /dev/null
+++ b/contrib/src/gcrypt/work-around-libtool-limitation.patch
@@ -0,0 +1,25 @@
......@@ -53,5 +53,5 @@ index 0000000000..df97ffb488
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.11.0
2.9.3
From 4ca5a43c588b61d5c7f231eca13d5e3d4a426d45 Mon Sep 17 00:00:00 2001
From d8657cec34dc2b98203c6336b435fa911af35821 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 0000000000..f1d3ccc71f
index 0000000..f1d3ccc
--- /dev/null
+++ b/contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch
@@ -0,0 +1,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 1484e7ab82..200a98e828 100644
index 1484e7a..200a98e 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 1484e7ab82..200a98e828 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.11.0
2.9.3
From fb8d6688f6acd9ba2dcb0abc7457eff57d3dc058 Mon Sep 17 00:00:00 2001
From 43ef715ca8baacd21e7ffdf94bd3b9835068d4f4 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 367bc49868..e23727e2c9 100644
index 367bc49..e23727e 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -2,10 +2,10 @@
......@@ -25,5 +25,5 @@ index 367bc49868..e23727e2c9 100644
FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
else
--
2.11.0
2.9.3
From 482a63a267812ba6421cc94a610de9d295cbbbf5 Mon Sep 17 00:00:00 2001
From 630accc5503268dffe35de63e88844d0b3e69abb 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 0000000000..2d60cf7140
index 0000000..2d60cf7
--- /dev/null
+++ b/contrib/src/ffmpeg/patch-as-patch-can.patch
@@ -0,0 +1,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 e23727e2c9..ae32c97616 100644
index e23727e..ae32c97 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -22,6 +22,9 @@ FFMPEGCONF = \
......@@ -58,5 +58,5 @@ index e23727e2c9..ae32c97616 100644
.ffmpeg: ffmpeg
--
2.11.0
2.9.3
From d9610d5c0eb20d91c3bc7cb37fbdab9ae917c8bf Mon Sep 17 00:00:00 2001
From 235b41c105c36a878c16df03c4a2596141170aaf 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
Subject: [PATCH 13/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 6d051ba1ea..ea3744da29 100644
index 6d051ba..ea3744d 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -174,7 +174,7 @@ public:
......@@ -48,5 +48,5 @@ index 6d051ba1ea..ea3744da29 100644
if( psz_path == NULL )
return VLC_EGENERIC;
--
2.11.0
2.9.3
From 9654fc52d92167a344188d02a0e9cdb064f62bd6 Mon Sep 17 00:00:00 2001
From 5ebc4cdb39eee4935187daa636b6f4665598f6dd 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
Subject: [PATCH 14/20] contrib/gcrypt: update patches
---
contrib/src/gcrypt/fix-sha1-ssse3-for-clang.patch | 308 ++++++++++++++++++++-
......@@ -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 f1d3ccc71f..21d7a30c8d 100644
index f1d3ccc..21d7a30 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 f1d3ccc71f..21d7a30c8d 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 df97ffb488..957f268ad2 100644
index df97ffb..957f268 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 df97ffb488..957f268ad2 100644
# Need to include ../src in addition to top_srcdir because gcrypt.h is
--
2.11.0
2.9.3
From 21d9cfe8ca718a380a32f12145cbd137d4c17df7 Mon Sep 17 00:00:00 2001
From e89831988f1374431fb2664b022d7959f5892ae3 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
Subject: [PATCH 15/20] deinterlace-merge-arm64: fix linking on appleOS
---
modules/arm_neon/asm64.S | 46 ++++++++++++++++++++++++++
......@@ -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 0000000000..d77816312b
index 0000000..d778163
--- /dev/null
+++ b/modules/arm_neon/asm64.S
@@ -0,0 +1,46 @@
......@@ -62,7 +62,7 @@ index 0000000000..d77816312b
+.endm
+
diff --git a/modules/video_filter/deinterlace/merge_arm64.S b/modules/video_filter/deinterlace/merge_arm64.S
index db19e54caf..63c04d3fdd 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 @@
......@@ -107,5 +107,5 @@ index db19e54caf..63c04d3fdd 100644
ret
+endfunc
--
2.11.0
2.9.3
From f9251ea08de5c4d1442e6283f0938953e5c417de Mon Sep 17 00:00:00 2001
From d9ef45d56d22bfef27ec8dc6895d4701b41cfa0b 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
Subject: [PATCH 16/20] ios2 vout: add subpicture rendering in the zero copy
pipeline
---
......@@ -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 d99b91d8bc..e235c6146c 100644
index e91c624..6a8c4f5 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -46,6 +46,7 @@
......@@ -516,5 +516,5 @@ index d99b91d8bc..e235c6146c 100644
glGetProgramiv(prog, GL_LINK_STATUS, &status);
if (status == 0) {
--
2.11.0
2.9.3
From 5e9353c55e4dd31877c49e2ff5ed8e85c92fee86 Mon Sep 17 00:00:00 2001
From 6efbf5badf7f56b888d1e465eb426acfdc58660c Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 18/20] libvlc_media: add cookie_jar API
Subject: [PATCH 17/20] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......@@ -12,7 +12,7 @@ Subject: [PATCH 18/20] libvlc_media: add cookie_jar API
5 files changed, 72 insertions(+)
diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index 01e571c519..5ca39f51a3 100644
index 01e571c..5ca39f5 100644
--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
@@ -876,6 +876,41 @@ LIBVLC_API
......@@ -58,7 +58,7 @@ index 01e571c519..5ca39f51a3 100644
# ifdef __cplusplus
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 5262ebcc13..5abea21f0d 100644
index 5262ebc..5abea21 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -216,6 +216,8 @@ libvlc_media_set_user_data
......@@ -71,7 +71,7 @@ index 5262ebcc13..5abea21f0d 100644
libvlc_playlist_play
libvlc_release
diff --git a/lib/media.c b/lib/media.c
index fdd2445c3e..e97e56d1d7 100644
index fdd2445..e97e56d 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -396,6 +396,8 @@ libvlc_media_t * libvlc_media_new_from_input_item(
......@@ -119,7 +119,7 @@ index fdd2445c3e..e97e56d1d7 100644
+ vlc_http_cookies_clear( p_md->p_cookie_jar );
+}
diff --git a/lib/media_internal.h b/lib/media_internal.h
index f063ddb5fa..17bbd84fac 100644
index f063ddb..17bbd84 100644
--- a/lib/media_internal.h
+++ b/lib/media_internal.h
@@ -30,6 +30,7 @@
......@@ -139,7 +139,7 @@ index f063ddb5fa..17bbd84fac 100644
/* Media Descriptor */
diff --git a/lib/media_player.c b/lib/media_player.c
index 52f7f777b4..754ecc4000 100644
index 930190c..ed2a150 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -605,6 +605,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -150,7 +150,7 @@ index 52f7f777b4..754ecc4000 100644
/* Video */
var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT);
@@ -962,6 +963,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
@@ -961,6 +962,12 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi )
return -1;
}
......@@ -164,5 +164,5 @@ index 52f7f777b4..754ecc4000 100644
p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL,
--
2.11.0
2.9.3
From 1b9a4a5db9b5e44646de397ad7d783f33d519940 Mon Sep 17 00:00:00 2001
From 6e5087b16018730fe0360729346aaa03a15cfd11 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 19/20] http: add vlc_http_cookies_clear
Subject: [PATCH 18/20] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......@@ -11,7 +11,7 @@ Clear all cookies without deleting the jar.
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/vlc_http.h b/include/vlc_http.h
index ed7e1613da..da1fe4ef1a 100644
index ed7e161..da1fe4e 100644
--- a/include/vlc_http.h
+++ b/include/vlc_http.h
@@ -71,6 +71,7 @@ VLC_API char *vlc_http_auth_FormatAuthorizationHeader
......@@ -23,7 +23,7 @@ index ed7e1613da..da1fe4ef1a 100644
/**
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index d967523457..71623f3c52 100644
index d967523..71623f3 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -136,6 +136,7 @@ vlc_http_auth_ParseAuthenticationInfoHeader
......@@ -35,7 +35,7 @@ index d967523457..71623f3c52 100644
vlc_http_cookies_fetch
httpd_ClientIP
diff --git a/src/misc/httpcookies.c b/src/misc/httpcookies.c
index b6d174b3da..2090f697fb 100644
index b6d174b..2090f69 100644
--- a/src/misc/httpcookies.c
+++ b/src/misc/httpcookies.c
@@ -281,18 +281,20 @@ vlc_http_cookie_jar_t * vlc_http_cookies_new(void)
......@@ -64,5 +64,5 @@ index b6d174b3da..2090f697fb 100644
}
--
2.11.0
2.9.3
From 9c9867038a6800b7cfab9f10c1dbc9b1b659b0ee Mon Sep 17 00:00:00 2001
From 4a089363f4b2174426fe913d4f1ebc275d279a93 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 20/20] videotoolbox: temporarily disable H263 decoding on iOS
Subject: [PATCH 19/20] 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 54a42bac06..71b1ed4b52 100644
index 54a42ba..71b1ed4 100644
--- a/modules/codec/videotoolbox.m
+++ b/modules/codec/videotoolbox.m
@@ -198,11 +198,11 @@ static CMVideoCodecType CodecPrecheck(decoder_t *p_dec)
......@@ -25,5 +25,5 @@ index 54a42bac06..71b1ed4b52 100644
case VLC_CODEC_PRORES:
/* the VT decoder can't differenciate between the ProRes flavors, so we do it */
--
2.11.0
2.9.3
From fb01c554826a50e09433d058186c600163231e23 Mon Sep 17 00:00:00 2001
From d5f5f6d528d3e6bcc24bd682b483a6334200b303 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [PATCH 20/20] Add AC-3 pass-through
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
---
extras/package/ios/build.sh | 2 --
include/vlc/libvlc_media_player.h | 10 +++++++++
lib/audio.c | 16 +++++++++++++++
lib/media_player.c | 1 +
modules/audio_output/audiounit_ios.m | 39 +++++++++++++++++++++++++++---------
5 files changed, 56 insertions(+), 12 deletions(-)
4 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index b680033529..7485eb539c 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh