Removed unused or redondant fields from subpicture.

[vlc] / src / osd / osd_text.c

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
index fc878fc37b6e4bc40e323041be8568174c58154b..ea2c969ac4d6919b7fffd127fb694d922b227bb5 100644 (file)
--- a/src/osd/osd_text.c
+++ b/src/osd/osd_text.c
@@ -79,7 +79,14 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, int i_channel,
     if( !psz_string ) return VLC_EGENERIC;
 
     p_spu = spu_CreateSubpicture( p_spu_channel );
-    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;
 
     /* Create a new subpicture region */
     memset( &fmt, 0, sizeof(video_format_t) );
@@ -97,15 +104,8 @@ int osd_ShowTextAbsolute( spu_t *p_spu_channel, 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->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_spu_channel, p_spu );