Commit 656df99b authored by Felix Paul Kühne's avatar Felix Paul Kühne

MVK: rebase libvlc

parent ccc2fd72
From ca7145d5bfa3de0409b01a50843e3f3255fae1ee Mon Sep 17 00:00:00 2001
From 3ffbb4b323977540db0af3e22182d824df8fb993 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/13] arm_neon: added function macro to handle the underscore
......@@ -65,5 +65,5 @@ index 0000000..d853255
+.endm
+
--
2.7.2
2.8.1
From 6978af68d4ffc4cbb429f5a7462d73b9aac326e0 Mon Sep 17 00:00:00 2001
From aeb583dd74d924e43b4bc4ca2edad2b205b262f1 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/13] deinterlace/merge: use a macro to fix compilation for
......@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
b 1b
+endfunc
--
2.7.2
2.8.1
From 9e64238117b9bb982fc6ec004eec431459dbb0c6 Mon Sep 17 00:00:00 2001
From 59cd7645d66887ceaf28ea625f5e1a39b08437cb 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/13] lib/media player: inherit deinterlace variable to
......@@ -9,7 +9,7 @@ Subject: [PATCH 03/13] 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 b278c6f..a2b02f4 100644
index 2a8eb5f..f1da39b 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -609,7 +609,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -22,5 +22,5 @@ index b278c6f..a2b02f4 100644
var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
--
2.7.2
2.8.1
From 9ed10cb451e2e9a8ef3cd0b47a309e78e1b3686d Mon Sep 17 00:00:00 2001
From b5f5ead2b6515d5f8cd17fbe30585ef5f710be05 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/13] arm_neon: work-around libtool issue
......@@ -18,5 +18,5 @@ index db81ec0..e67e07e 100644
libchroma_yuv_neon_plugin_la_SOURCES = \
--
2.7.2
2.8.1
From 4370f22032924866f27b5baeeb2712c5f8b1ce6c Mon Sep 17 00:00:00 2001
From 258b8b777f2511de518b8cab43caca680be65d53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 19 Dec 2014 22:14:55 +0100
Subject: [PATCH 05/13] libvlc/media: re-parse if flags changed
......@@ -38,5 +38,5 @@ index 35f06a4..d28297e 100644
/* Media Descriptor */
--
2.7.2
2.8.1
From c0b74a112a16ebc69202f9a61584820d9c578157 Mon Sep 17 00:00:00 2001
From 453d6f7698626f9078436c16c96e6dab778c1fdf 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/13] arm_neon: fix iOS linking
......@@ -194,5 +194,5 @@ index a94ae85..54b43a7 100644
pop {r4,pc}
+endfunc
--
2.7.2
2.8.1
From 3c34c3632b750c696c244b57fc8e9c0159569a82 Mon Sep 17 00:00:00 2001
From c3bf5a9003115176e1510ff37fc550884f4fe2f1 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 07/13] disable neon volume plugin
......@@ -19,5 +19,5 @@ index e67e07e..6909752 100644
libyuv_rgb_neon_plugin.la
endif
--
2.7.2
2.8.1
From 5f07a9c63c186738e1e98fbcd790bbc0ea894211 Mon Sep 17 00:00:00 2001
From 3e924c7dd19821d6b727c1938065063d4cb9c030 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 08/13] contrib/gcrypt: work-around a libtool limitation
......@@ -53,5 +53,5 @@ index 0000000..df97ffb
+ AM_CFLAGS = $(GPG_ERROR_CFLAGS)
+
--
2.7.2
2.8.1
From 13e16d2f022d007ec83ee5c17f6f5fd7ddc14904 Mon Sep 17 00:00:00 2001
From 3cd668de58e4d7a77db03aa4a03ad3c067ed1712 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 09/13] src/misc: fix compilation for OS without fork()
......@@ -21,5 +21,5 @@ index 4a5f2a0..79b28e4 100644
{
pid_t pid = fork();
--
2.7.2
2.8.1
From 3692350abbc72091d4211e7efd178a6042bca272 Mon Sep 17 00:00:00 2001
From 03f0b86c12a6c31f26ac3a259edb5d15678d3f90 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 10/13] libvlc: hack to disable daemon mode
......@@ -23,5 +23,5 @@ index 3468e0e..2d870bd 100644
/* Check for daemon mode */
if( var_InheritBool( p_libvlc, "daemon" ) )
--
2.7.2
2.8.1
From 6cc16a0e0fa920698c0e8f4399b062959c449b4e Mon Sep 17 00:00:00 2001
From 8e363ed73820efb5cf35512184a97630909b16fe 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 11/13] contrib/gcrypt: fix tvOS compilation
......@@ -56,5 +56,5 @@ index 0471522..ac20d02 100644
GCRYPT_CONF += --disable-aesni-support
else
--
2.7.2
2.8.1
From 260e34059dac613c47ba884aa521d9f86c8ac9f6 Mon Sep 17 00:00:00 2001
From a8b72facb9e7aec4fac8eff326dd777dcd707597 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:46:27 +0100
Subject: [PATCH 12/13] contrib/harfbuzz: fix iOS compilation when CoreText is
......@@ -61,5 +61,5 @@ index f21917c..2058b4a 100644
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.7.2
2.8.1
From 5c623a7e1333212b5ecc7f43ed657db6ec72f940 Mon Sep 17 00:00:00 2001
From 99a39c97fd6607a8ed1f5431a267554d9ac0910b 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 13/13] libvlc: expose a base set of freetype options to
......@@ -14,10 +14,10 @@ Subject: [PATCH 13/13] 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 970bdf1..c87b437 100644
index 73562b8..17b0450 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1519,6 +1519,32 @@ LIBVLC_API float libvlc_video_get_adjust_float( libvlc_media_player_t *p_mi,
@@ -1559,6 +1559,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 );
......@@ -75,7 +75,7 @@ index 03e9a5e..ec2ca4a 100644
libvlc_video_take_snapshot
libvlc_vlm_add_broadcast
diff --git a/lib/media_player.c b/lib/media_player.c
index a2b02f4..50ef3e6 100644
index f1da39b..29623db 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -639,6 +639,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
......@@ -312,5 +312,5 @@ index 44b2731..7f1abec 100644
/**
--
2.7.2
2.8.1
......@@ -17,7 +17,7 @@ SCARY=yes
TVOS=no
BITCODE=no
TESTEDHASH=f47aace5
TESTEDHASH=7faca74c
usage()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment