X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fvideo_output%2Fvideo_text.c;h=a0499bb0e66cf1eb692d3851e9e73c5d757ea965;hb=14dd917d87e75ac1c7284373020ec3982082011b;hp=2083438707dbf764e05636ab00100de85b163da2;hpb=3318cf724a7f27e5146f55c1d4155a000829c525;p=vlc diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index 2083438707..a0499bb0e6 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -81,7 +81,16 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel, if( !psz_string ) return VLC_EGENERIC; p_spu = spu_CreateSubpicture( p_vout->p_spu ); - if( !p_spu ) return VLC_EGENERIC; + if( !p_spu ) + return VLC_EGENERIC; + + p_spu->i_channel = i_channel; + p_spu->i_start = i_start; + p_spu->i_stop = i_stop; + p_spu->b_ephemer = true; + p_spu->b_absolute = false; + p_spu->b_fade = true; + /* Create a new subpicture region */ memset( &fmt, 0, sizeof(video_format_t) ); @@ -99,16 +108,8 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel, p_spu->p_region->psz_text = strdup( psz_string ); p_spu->p_region->i_align = i_flags & SUBPICTURE_ALIGN_MASK; - p_spu->i_start = i_start; - p_spu->i_stop = i_stop; - p_spu->b_ephemer = true; - p_spu->b_absolute = false; - p_spu->b_fade = true; - - p_spu->i_x = i_hmargin; - p_spu->i_y = i_vmargin; - p_spu->i_flags = i_flags & ~SUBPICTURE_ALIGN_MASK; - p_spu->i_channel = i_channel; + p_spu->p_region->i_x = i_hmargin; + p_spu->p_region->i_y = i_vmargin; spu_DisplaySubpicture( p_vout->p_spu, p_spu );