[vlc-commits] marq: fix variable shadowing

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun 29 23:31:12 2017 +0300| [a90a0e9ed647829b5d792d93770bc88451f88645] | committer: Rémi Denis-Courmont

marq: fix variable shadowing

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a90a0e9ed647829b5d792d93770bc88451f88645
---

 modules/spu/marq.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/spu/marq.c b/modules/spu/marq.c
index 1af990c884..1834e57f55 100644
--- a/modules/spu/marq.c
+++ b/modules/spu/marq.c
@@ -272,7 +272,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
 {
     filter_sys_t *p_sys = p_filter->p_sys;
     subpicture_t *p_spu = NULL;
-    video_format_t fmt;
 
     vlc_mutex_lock( &p_sys->lock );
     if( p_sys->last_time + p_sys->i_refresh > date )
@@ -303,13 +302,10 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     if( !p_spu )
         goto out;
 
-    memset( &fmt, 0, sizeof(video_format_t) );
-    fmt.i_chroma = VLC_CODEC_TEXT;
-    fmt.i_width = fmt.i_height = 0;
-    fmt.i_x_offset = 0;
-    fmt.i_y_offset = 0;
-    fmt.i_sar_den = fmt.i_sar_num = 1;
-    p_spu->p_region = subpicture_region_New( &fmt );
+    video_format_t vfmt;
+    video_format_Init( &vfmt, VLC_CODEC_TEXT );
+    vfmt.i_sar_den = vfmt.i_sar_num = 1;
+    p_spu->p_region = subpicture_region_New( &vfmt );
     if( !p_spu->p_region )
     {
         subpicture_Delete( p_spu );