Skip to content

V
vlc
Commit e225681c authored by Francois Cartegnie's avatar Francois Cartegnie
Browse files
Options

freetype: reorder font priorities

parent 22469573
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
modules/text_renderer/freetype.c
View file @ e225681c
...@@ -314,9 +314,13 @@ static int GetFontSize( filter_t *p_filter ) ...@@ -314,9 +314,13 @@ static int GetFontSize( filter_t *p_filter )
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
int i_size = 0; int i_size = 0;
if( p_sys->p_default_style->i_font_size ) if( p_sys->p_forced_style->i_font_size )
{ {
i_size = p_sys->p_default_style->i_font_size; i_size = p_sys->p_forced_style->i_font_size;
}
else if( p_sys->p_forced_style->f_font_relsize )
{
i_size = (int) p_filter->fmt_out.video.i_height * p_sys->p_forced_style->f_font_relsize;
} }
else if( p_sys->p_default_style->f_font_relsize ) else if( p_sys->p_default_style->f_font_relsize )
{ {
......
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