[vlc-devel] commit: Fixed libass 0.9.7 support. (Laurent Aimar )
git version control
git at videolan.org
Sat Jul 25 14:27:30 CEST 2009
vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Fri Jul 24 23:42:14 2009 +0200| [68db349f057d6ae9f8aef0dad9acb4c6177d8f4e] | committer: Jean-Baptiste Kempf
Fixed libass 0.9.7 support.
b670356d167bf66f870ee3daf9dbac581eaf0651 introduced a segfault.
(cherry picked from commit e1cfb704f3b4254902cc7ab70ef352c4f4b57ecf)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=68db349f057d6ae9f8aef0dad9acb4c6177d8f4e
---
modules/codec/libass.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index fc5a13c..645581b 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -750,7 +750,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
dialog_ProgressSet( p_dialog, NULL, 0.2 );
#endif
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
- ass_set_fonts( p_renderer, psz_font, psz_family, true, NULL, 0 ); // setup default font/family
+ ass_set_fonts( p_renderer, psz_font, psz_family, true, NULL, 1 ); // setup default font/family
#else
ass_set_fonts( p_renderer, psz_font, psz_family ); // setup default font/family
#endif
@@ -760,7 +760,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
#else
/* FIXME you HAVE to give him a font if no fontconfig */
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
- ass_set_fonts( p_renderer, psz_font, psz_family, false, NULL, 0 );
+ ass_set_fonts( p_renderer, psz_font, psz_family, false, NULL, 1 );
#else
ass_set_fonts_nofc( p_renderer, psz_font, psz_family );
#endif
More information about the vlc-devel
mailing list