[vlc-commits] libass: remove legacy code for Apple platforms
Felix Paul Kühne
git at videolan.org
Tue Nov 3 14:37:52 CET 2015
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Nov 3 14:37:40 2015 +0100| [30819e5de436ccdbe53a993b7a435bd6aebcdb50] | committer: Felix Paul Kühne
libass: remove legacy code for Apple platforms
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=30819e5de436ccdbe53a993b7a435bd6aebcdb50
---
modules/codec/libass.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index 92e7085..f722fc8 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -219,7 +219,7 @@ static int Create( vlc_object_t *p_this )
#endif
#ifdef HAVE_FONTCONFIG
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32)
dialog_progress_bar_t *p_dialog =
dialog_ProgressCreate( p_dec,
_("Building font cache"),
@@ -227,7 +227,7 @@ static int Create( vlc_object_t *p_this )
"This should take less than a minute." ), NULL );
#endif
ass_set_fonts( p_renderer, psz_font, psz_family, 1, NULL, 1 ); // setup default font/family
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32)
if( p_dialog )
{
dialog_ProgressSet( p_dialog, NULL, 1.0 );
@@ -235,7 +235,6 @@ static int Create( vlc_object_t *p_this )
}
#endif
#else
- /* FIXME you HAVE to give him a font if no fontconfig */
ass_set_fonts( p_renderer, psz_font, psz_family, 1, NULL, 1 );
#endif
More information about the vlc-commits
mailing list