MVK: update libvlc

MobileVLCKit/patches/0001-arm_neon-added-function-macro-to-handle-the-undersco.patch

@@ -1,7 +1,7 @@
-From 4e135f13be04c4b8eedf20fdbaa072bd6fe2b072 Mon Sep 17 00:00:00 2001
+From 4c413d2186eb9539b0e48da5d6e75a304d2ae710 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/11] arm_neon: added function macro to handle the underscore
+Subject: [PATCH 01/10] arm_neon: added function macro to handle the underscore
  prefix for the iOS ARM ABI
 
 ---
@@ -65,5 +65,5 @@ index 0000000..d853255
 +.endm
 +
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0002-arm_neon-use-a-macro-to-fix-compilation-for-iOS.patch

@@ -1,208 +0,0 @@
-From dfaeadfb6a32cbe4b9f7e1a76834b486b3e1b41f 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:01:49 +0200
-Subject: [PATCH 02/11] arm_neon: use a macro to fix compilation for iOS
-
----
- modules/arm_neon/amplify.S              |  9 +++---
- modules/arm_neon/simple_channel_mixer.S | 57 +++++++++++++++------------------
- 2 files changed, 31 insertions(+), 35 deletions(-)
-
-diff --git a/modules/arm_neon/amplify.S b/modules/arm_neon/amplify.S
-index 5938118..578f972 100644
---- a/modules/arm_neon/amplify.S
-+++ b/modules/arm_neon/amplify.S
-@@ -18,6 +18,8 @@
-  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-  @****************************************************************************/
- 
-+#include "asm.S"
-+
- 	.syntax	unified
- 	.arm
- 	.fpu	neon
-@@ -26,10 +28,8 @@
- #define	DST	r0
- #define	SRC	r1
- #define	SIZE	r2
--	.align 2
--	.global amplify_float_arm_neon
--	.type	amplify_float_arm_neon, %function
--amplify_float_arm_neon:
-+
-+function amplify_float_arm_neon, export=1
- 	cmp		SIZE,	#0
- 	bxeq		lr
- #ifdef __ARM_PCS
-@@ -79,3 +79,4 @@ amplify_float_arm_neon:
- 4:	vst1.f32	{d20-d21},	[DST,:128]!
- 5:	vst1.f32	{d16-d17},	[DST,:128]!
- 	bx		lr
-+endfunc
-diff --git a/modules/arm_neon/simple_channel_mixer.S b/modules/arm_neon/simple_channel_mixer.S
-index dcc51ed..4722be4 100644
---- a/modules/arm_neon/simple_channel_mixer.S
-+++ b/modules/arm_neon/simple_channel_mixer.S
-@@ -19,6 +19,8 @@
-  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-  @****************************************************************************/
- 
-+#include "asm.S"
-+
- 	.fpu neon
- 	.text
- 	.align 2
-@@ -34,9 +36,8 @@ coeff_7to2:
- 	.float 0.5
- 	.float 0.25
- 	.float 0.25
--	.global convert_7to2_neon_asm
--	.type	convert_7to2_neon_asm, %function
--convert_7to2_neon_asm:
-+
-+function convert_7to2_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_7to2
-@@ -63,16 +64,15 @@ convert_7to2_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_5to2:
- 	.float 0.5
- 	.float 0.5
- 	.float 0.33
- 	.float 0.33
--	.global convert_5to2_neon_asm
--	.type	convert_5to2_neon_asm, %function
--convert_5to2_neon_asm:
-+
-+function convert_5to2_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_5to2
-@@ -95,14 +95,13 @@ convert_5to2_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_4to2:
- 	.float 0.5
- 	.float 0.5
--	.global convert_4to2_neon_asm
--	.type	convert_4to2_neon_asm, %function
--convert_4to2_neon_asm:
-+
-+function convert_4to2_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_4to2
-@@ -119,14 +118,13 @@ convert_4to2_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_3to2:
- 	.float 0.5
- 	.float 0.5
--	.global convert_3to2_neon_asm
--	.type	convert_3to2_neon_asm, %function
--convert_3to2_neon_asm:
-+
-+function convert_3to2_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_3to2
-@@ -147,16 +145,15 @@ convert_3to2_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_7to1:
- 	.float 0.25
- 	.float 0.25
- 	.float 0.125
- 	.float 0.125
--	.global convert_7to1_neon_asm
--	.type	convert_7to1_neon_asm, %function
--convert_7to1_neon_asm:
-+
-+function convert_7to1_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_7to1
-@@ -181,16 +178,15 @@ convert_7to1_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_5to1:
- 	.float 0.25
- 	.float 0.25
- 	.float 0.16666667
- 	.float 0.16666667
--	.global convert_5to1_neon_asm
--	.type	convert_5to1_neon_asm, %function
--convert_5to1_neon_asm:
-+
-+function convert_5to1_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_5to1
-@@ -212,16 +208,15 @@ convert_5to1_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_7to4:
- 	.float 0.5
- 	.float 0.5
- 	.float 0.16666667
- 	.float 0.16666667
--	.global convert_7to4_neon_asm
--	.type	convert_7to4_neon_asm, %function
--convert_7to4_neon_asm:
-+
-+function convert_7to4_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_7to4
-@@ -247,14 +242,13 @@ convert_7to4_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
--
-+endfunc
- 
- coeff_5to4:
- 	.float 0.5
- 	.float 0.5
--	.global convert_5to4_neon_asm
--	.type	convert_5to4_neon_asm, %function
--convert_5to4_neon_asm:
-+
-+function convert_5to4_neon_asm, export=1
- 	push {r4,lr}
- 
- 	adr COEFF, coeff_5to4
-@@ -277,3 +271,4 @@ convert_5to4_neon_asm:
- 	bne 0b
- 
- 	pop {r4,pc}
-+endfunc
-2.4.6
-

MobileVLCKit/patches/0003-deinterlace-merge-use-a-macro-to-fix-compilation-for.patch

@@ -1,7 +1,7 @@
-From c5385c3db1037b91e3ca781f8c56e458a001878d Mon Sep 17 00:00:00 2001
+From ba2fc3de9aa04467b62a8c0a87bb022a4e643ff2 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 03/11] deinterlace/merge: use a macro to fix compilation for
+Subject: [PATCH 02/10] deinterlace/merge: use a macro to fix compilation for
  iOS
 
 ---
@@ -82,5 +82,5 @@ index dd77902..03e5042 100644
  	b		1b
 +endfunc
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0004-libass-fix-text-rendering-on-iOS-by-providing-a-font.patch

@@ -1,7 +1,7 @@
-From 5e9949ee2de20b9868c62318fa596e5c59e2fb67 Mon Sep 17 00:00:00 2001
+From f79dc507e51242bc7deec1755ea979c740fb6aa0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 29 May 2013 13:25:54 +0200
-Subject: [PATCH 04/11] libass: fix text rendering on iOS by providing a font
+Subject: [PATCH 03/10] libass: fix text rendering on iOS by providing a font
  lookup mechanism for the font shipped with Aspen
 
 ---
@@ -65,5 +65,5 @@ index 067ef6b..8460dad 100644
      const char *psz_font = NULL; /* We don't ship a default font with VLC */
      const char *psz_family = "Arial"; /* Use Arial if we can't find anything more suitable */
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0005-freetype-added-a-fake-font-lookup-mechanism-for-iOS-.patch

@@ -1,7 +1,7 @@
-From 0c1641a3593413ba01a28da9a8b674a89a486705 Mon Sep 17 00:00:00 2001
+From 6daa2880fc458e706be9cda7d45e2cf65669cf88 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 22 Jan 2014 13:55:16 +0100
-Subject: [PATCH 05/11] freetype: added a fake font lookup mechanism for iOS to
+Subject: [PATCH 04/10] freetype: added a fake font lookup mechanism for iOS to
  use the packaged demo fonts
 
 ---
@@ -11,10 +11,10 @@ Subject: [PATCH 05/11] freetype: added a fake font lookup mechanism for iOS to
  3 files changed, 45 insertions(+)
 
 diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
-index 6b24586..1dcd3cf 100644
+index 140c30d..3058ab1 100644
 --- a/modules/text_renderer/freetype.c
 +++ b/modules/text_renderer/freetype.c
-@@ -1243,6 +1243,8 @@ static int Create( vlc_object_t *p_this )
+@@ -1199,6 +1199,8 @@ static int Create( vlc_object_t *p_this )
  #elif defined( __APPLE__ )
  #if !TARGET_OS_IPHONE
      p_sys->pf_select = MacLegacy_Select;
@@ -96,5 +96,5 @@ index cff52b1..40b25fb 100644
  #endif
  
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0006-contrib-gcrypt-simplify-compilation-by-disabling-doc.patch

@@ -1,7 +1,7 @@
-From 24d2fec8b470585ae2a375af7ebf2f7409b287d4 Mon Sep 17 00:00:00 2001
+From f318ca18e3480b84979f6917c186bb66ea7f69ed 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 06/11] contrib/gcrypt: simplify compilation by disabling /doc
+Subject: [PATCH 05/10] contrib/gcrypt: simplify compilation by disabling /doc
  and work-around a libtool limitation
 
 ---
@@ -106,5 +106,5 @@ index 0000000..df97ffb
 + AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 + 
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0007-lib-media-player-inherit-deinterlace-variable-to-ach.patch

@@ -1,7 +1,7 @@
-From 85880ce55a94beb2c38700f7238ee1ca1b13448d Mon Sep 17 00:00:00 2001
+From 32dce2b2176d82ab1fa00d063d92bde75ed76ad9 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 07/11] lib/media player: inherit deinterlace variable to
+Subject: [PATCH 06/10] lib/media player: inherit deinterlace variable to
  achieve correct value on first use
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 07/11] 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 ba7158e..18363db 100644
+index c727b6e..83d7a6d 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -602,7 +602,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -596,7 +596,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "zoom", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "aspect-ratio", VLC_VAR_STRING);
      var_Create (mp, "crop", VLC_VAR_STRING);
@@ -22,5 +22,5 @@ index ba7158e..18363db 100644
  
      var_Create (mp, "vbi-page", VLC_VAR_INTEGER);
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0008-arm_neon-work-around-libtool-issue.patch

@@ -1,14 +1,14 @@
-From 8a9f38d159d34b04d962d28e0783887b214e8764 Mon Sep 17 00:00:00 2001
+From 157d8633a831b495a6235ee25c60d9fecdecf37b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Wed, 18 Feb 2015 21:35:16 +0100
-Subject: [PATCH 08/11] arm_neon: work-around libtool issue
+Subject: [PATCH 07/10] arm_neon: work-around libtool issue
 
 ---
  modules/arm_neon/Makefile.am | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
-index 4e73a4f..43ef527 100644
+index db81ec0..e67e07e 100644
 --- a/modules/arm_neon/Makefile.am
 +++ b/modules/arm_neon/Makefile.am
 @@ -1,3 +1,5 @@
@@ -16,7 +16,7 @@ index 4e73a4f..43ef527 100644
 +
  neondir = $(pluginsdir)/arm_neon
  
- libsimple_channel_mixer_neon_plugin_la_SOURCES = \
+ libchroma_yuv_neon_plugin_la_SOURCES = \
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0009-libvlc-media-re-parse-if-flags-changed.patch

@@ -1,7 +1,7 @@
-From 366c424f6396653052769e68616fde591065cc0f Mon Sep 17 00:00:00 2001
+From ee06c96b5781c138861a98bf01aa287d8790cc79 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 19 Jun 2015 15:26:06 +0200
-Subject: [PATCH 09/11] libvlc/media: re-parse if flags changed
+Subject: [PATCH 08/10] libvlc/media: re-parse if flags changed
 
 ---
  lib/media.c          | 6 ++++++
@@ -9,10 +9,10 @@ Subject: [PATCH 09/11] libvlc/media: re-parse if flags changed
  2 files changed, 7 insertions(+)
 
 diff --git a/lib/media.c b/lib/media.c
-index f5886ad..87a02d8 100644
+index 3b717c7..1b1c033 100644
 --- a/lib/media.c
 +++ b/lib/media.c
-@@ -724,6 +724,12 @@ static int media_parse(libvlc_media_t *media, bool b_async,
+@@ -716,6 +716,12 @@ static int media_parse(libvlc_media_t *media, bool b_async,
      vlc_mutex_lock(&media->parsed_lock);
      needed = !media->has_asked_preparse;
      media->has_asked_preparse = true;
@@ -38,5 +38,5 @@ index 35f06a4..d28297e 100644
  
  /* Media Descriptor */
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0010-disable-neon-volume-plugin.patch

@@ -1,23 +1,23 @@
-From 3c15be854de4b1e2e84d72babbd5ba8b29066fe5 Mon Sep 17 00:00:00 2001
+From c2686297ba6b8360d61c4d87dce79f7d36b4d596 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Fri, 10 Jul 2015 19:57:18 +0200
-Subject: [PATCH 10/11] disable neon volume plugin
+Subject: [PATCH 09/10] disable neon volume plugin
 
 ---
  modules/arm_neon/Makefile.am | 1 -
  1 file changed, 1 deletion(-)
 
 diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
-index 43ef527..db81e3e 100644
+index e67e07e..6909752 100644
 --- a/modules/arm_neon/Makefile.am
 +++ b/modules/arm_neon/Makefile.am
-@@ -34,6 +34,5 @@ if HAVE_NEON
+@@ -27,6 +27,5 @@ libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
+ if HAVE_NEON
  neon_LTLIBRARIES = \
- 	libsimple_channel_mixer_neon_plugin.la \
  	libchroma_yuv_neon_plugin.la \
 -	libvolume_neon_plugin.la \
  	libyuv_rgb_neon_plugin.la
  endif
 -- 
-2.4.6
+2.5.1
 

MobileVLCKit/patches/0011-libvlc-add-preliminary-code-path-to-modify-quartztex.patch

@@ -1,7 +1,7 @@
-From 57631dbe84723508407b4810c3bc91439a8440a8 Mon Sep 17 00:00:00 2001
+From d683acbcd14fc59cdcbebd5b7ef90c13b3e7b202 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
 Date: Mon, 31 Mar 2014 17:54:01 +0200
-Subject: [PATCH 11/11] libvlc: add preliminary code path to modify quartztext
+Subject: [PATCH 10/10] libvlc: add preliminary code path to modify quartztext
  variables on-the-fly
 
 ---
@@ -45,10 +45,10 @@ index 0c7351b..b0b4208 100644
  
  /** \defgroup libvlc_audio LibVLC audio controls
 diff --git a/lib/libvlc.sym b/lib/libvlc.sym
-index 03577c7..d084c44 100644
+index 487fcba..06c9826 100644
 --- a/lib/libvlc.sym
 +++ b/lib/libvlc.sym
-@@ -229,6 +229,8 @@ libvlc_video_get_spu_count
+@@ -226,6 +226,8 @@ libvlc_video_get_spu_count
  libvlc_video_get_spu_delay
  libvlc_video_get_spu_description
  libvlc_video_get_teletext
@@ -57,7 +57,7 @@ index 03577c7..d084c44 100644
  libvlc_video_get_title_description
  libvlc_video_get_track
  libvlc_video_get_track_count
-@@ -253,6 +255,8 @@ libvlc_video_set_spu
+@@ -250,6 +252,8 @@ libvlc_video_set_spu
  libvlc_video_set_spu_delay
  libvlc_video_set_subtitle_file
  libvlc_video_set_teletext
@@ -67,10 +67,10 @@ index 03577c7..d084c44 100644
  libvlc_video_take_snapshot
  libvlc_vlm_add_broadcast
 diff --git a/lib/media_player.c b/lib/media_player.c
-index 18363db..1b8c948 100644
+index 83d7a6d..f15986d 100644
 --- a/lib/media_player.c
 +++ b/lib/media_player.c
-@@ -632,6 +632,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
+@@ -626,6 +626,12 @@ libvlc_media_player_new( libvlc_instance_t *instance )
      var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
      var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT);
  
@@ -139,10 +139,10 @@ index b2c9b34..588aa1d 100644
 +    return get_string( p_mi, "quartztext", textrenderer_option_bynumber(option) );
 +}
 diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c
-index 02e0482..5711d4c 100644
+index 8142155..1d05dcd 100644
 --- a/modules/text_renderer/quartztext.c
 +++ b/modules/text_renderer/quartztext.c
-@@ -66,6 +66,10 @@
+@@ -67,6 +67,10 @@
  static int  Create (vlc_object_t *);
  static void Destroy(vlc_object_t *);
  
@@ -153,9 +153,9 @@ index 02e0482..5711d4c 100644
  static int LoadFontsFromAttachments(filter_t *p_filter);
  
  static int RenderText(filter_t *, subpicture_region_t *,
-@@ -124,16 +128,20 @@ vlc_module_begin ()
- 
-     add_string("quartztext-font", DEFAULT_FONT, FONT_TEXT, FONT_LONGTEXT,
+@@ -128,16 +132,20 @@ vlc_module_begin ()
+               false)
+     add_string("quartztext-monofont", DEFAULT_MONOFONT, MONOSPACE_FONT_TEXT, FONT_LONGTEXT,
                false)
 -    add_integer("quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, FONTSIZER_TEXT,
 +        change_safe()
@@ -175,31 +175,29 @@ index 02e0482..5711d4c 100644
      set_callbacks(Create, Destroy)
  vlc_module_end ()
  
-@@ -175,6 +183,7 @@ struct offscreen_bitmap_t
+@@ -179,6 +187,7 @@ struct offscreen_bitmap_t
   *****************************************************************************/
  struct filter_sys_t
  {
 +	vlc_mutex_t    lock;
-     uint8_t        i_font_opacity;
-     int            i_font_color;
-     bool           b_outline;
-@@ -202,13 +211,13 @@ static int Create(vlc_object_t *p_this)
-     if (!p_sys)
-         return VLC_ENOMEM;
+     text_style_t  *p_default_style;
  
--    p_sys->style.psz_fontname = var_CreateGetString(p_this, "quartztext-font");;
-+    p_sys->style.psz_fontname = var_CreateGetStringCommand(p_this, "quartztext-font");
-     p_sys->style.psz_monofontname = strdup(p_sys->style.psz_fontname);
-     p_sys->style.i_font_size = GetFontSize(p_filter);;
-     p_sys->style.i_style_flags = 0;
+ #ifndef TARGET_OS_IPHONE
+@@ -208,11 +217,11 @@ static int Create(vlc_object_t *p_this)
+         free(p_sys);
+         return VLC_ENOMEM;
+     }
+-    p_sys->p_default_style->psz_fontname = var_CreateGetString(p_this, "quartztext-font");;
++    p_sys->p_default_style->psz_fontname = var_CreateGetStringCommand(p_this, "quartztext-font");;
+     p_sys->p_default_style->psz_monofontname = var_CreateGetString(p_this, "quartztext-monofont");
+     p_sys->p_default_style->i_font_size = GetFontSize(p_filter);
  
-     p_sys->i_font_opacity = 255;
--    p_sys->i_font_color = VLC_CLIP(var_CreateGetInteger(p_this, "quartztext-color") , 0, 0xFFFFFF);
-+    p_sys->i_font_color = VLC_CLIP(var_CreateGetIntegerCommand(p_this, "quartztext-color") , 0, 0xFFFFFF);
-     p_sys->b_outline = var_InheritBool(p_this, "quartztext-outline");
-     p_sys->b_shadow = var_InheritBool(p_this, "quartztext-shadow");
+-    p_sys->p_default_style->i_font_color = VLC_CLIP(var_CreateGetInteger(p_this, "quartztext-color") , 0, 0xFFFFFF);
++    p_sys->p_default_style->i_font_color = VLC_CLIP(var_CreateGetIntegerCommand(p_this, "quartztext-color") , 0, 0xFFFFFF);
+     p_sys->p_default_style->i_features |= STYLE_HAS_FONT_COLOR;
  
-@@ -219,6 +228,11 @@ static int Create(vlc_object_t *p_this)
+     if( var_InheritBool(p_this, "quartztext-outline") )
+@@ -244,6 +253,11 @@ static int Create(vlc_object_t *p_this)
      p_sys->i_fonts = 0;
  #endif
  
@@ -211,7 +209,7 @@ index 02e0482..5711d4c 100644
      LoadFontsFromAttachments(p_filter);
  
      return VLC_SUCCESS;
-@@ -233,6 +247,16 @@ static void Destroy(vlc_object_t *p_this)
+@@ -258,6 +272,16 @@ static void Destroy(vlc_object_t *p_this)
  {
      filter_t *p_filter = (filter_t *)p_this;
      filter_sys_t *p_sys = p_filter->p_sys;
@@ -228,7 +226,7 @@ index 02e0482..5711d4c 100644
  #ifndef TARGET_OS_IPHONE
      if (p_sys->p_fonts) {
          for (int k = 0; k < p_sys->i_fonts; k++) {
-@@ -619,12 +643,12 @@ static int GetFontSize(filter_t *p_filter)
+@@ -635,12 +659,12 @@ static int GetFontSize(filter_t *p_filter)
  {
      int i_size = 0;
  
@@ -244,7 +242,7 @@ index 02e0482..5711d4c 100644
          msg_Warn( p_filter, "invalid fontsize, using 12" );
          i_size = 12;
      }
-@@ -710,3 +734,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
+@@ -726,3 +750,23 @@ static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
  
      return VLC_SUCCESS;
  }
@@ -259,15 +257,15 @@ index 02e0482..5711d4c 100644
 +
 +    vlc_mutex_lock( &p_sys->lock );
 +    if( !strcmp( psz_var, "quartztext-font" ) )
-+        p_sys->style.psz_fontname = newval.psz_string;
++        p_sys->p_default_style->psz_fontname = newval.psz_string;
 +    else if( !strcmp( psz_var, "quartztext-fontsize" ) )
-+        p_sys->style.i_font_size = (int)p_filter->fmt_out.video.i_height / newval.i_int;
++        p_sys->p_default_style->i_font_size = (int)p_filter->fmt_out.video.i_height / newval.i_int;
 +    else if( !strcmp( psz_var, "quartztext-color" ) )
-+        p_sys->style.i_font_color = VLC_CLIP(newval.i_int, 0, 0xFFFFFF);
++        p_sys->p_default_style->i_font_color = VLC_CLIP(newval.i_int, 0, 0xFFFFFF);
 +    vlc_mutex_unlock( &p_sys->lock );
 +
 +    return VLC_SUCCESS;
 +}
 -- 
-2.4.6
+2.5.1
 

buildMobileVLCKit.sh

@@ -15,7 +15,7 @@ NONETWORK=no
 SKIPLIBVLCCOMPILATION=no
 SCARY=yes
 
-TESTEDHASH=5ef42a88
+TESTEDHASH=2a857bc8
 
 usage()
 {