Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / src / video_output / video_text.c

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index 26c8465519d08e0542077bac987499b6167c9019..bb77890cfa73e037929d642037de5b2c09a32373 100644 (file)
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -75,7 +75,7 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
 {
     subpicture_t *p_spu;
     video_format_t fmt;
-    (void)p_style; // FIXME: <-- why ask for this if it's unused?!?
+    /* (void)p_style; FIXME: <-- why ask for this if it's unused?!? */
 
     if( !psz_string ) return VLC_EGENERIC;
 
@@ -100,9 +100,9 @@ int vout_ShowTextAbsolute( vout_thread_t *p_vout, int i_channel,
     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 = VLC_TRUE;
-    p_spu->b_absolute = VLC_FALSE;
-    p_spu->b_fade = VLC_TRUE;
+    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;