Skip to content

V
vlc-1.1
Commit e1cfb704 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed libass 0.9.7 support. 

b670356d introduced a segfault.
parent 16be5123
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/codec/libass.c
View file @ e1cfb704
...@@ -735,7 +735,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) ...@@ -735,7 +735,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
dialog_ProgressSet( p_dialog, NULL, 0.2 ); dialog_ProgressSet( p_dialog, NULL, 0.2 );
#endif #endif
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000 #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 #else
ass_set_fonts( p_renderer, psz_font, psz_family ); // setup default font/family ass_set_fonts( p_renderer, psz_font, psz_family ); // setup default font/family
#endif #endif
...@@ -745,7 +745,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec ) ...@@ -745,7 +745,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
#else #else
/* FIXME you HAVE to give him a font if no fontconfig */ /* FIXME you HAVE to give him a font if no fontconfig */
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000 #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 #else
ass_set_fonts_nofc( p_renderer, psz_font, psz_family ); ass_set_fonts_nofc( p_renderer, psz_font, psz_family );
#endif #endif
......
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