From: Jean-Baptiste Kempf Date: Wed, 16 May 2007 19:09:04 +0000 (+0000) Subject: Should fix another bunch of: (near initialization for `fmt*') warnings. X-Git-Tag: 0.9.0-test0~7410 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c09b9f61b78e6ecea335dccca234cb3111657283;p=vlc Should fix another bunch of: (near initialization for `fmt*') warnings. --- diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index b67e1bfb38..5ad7475014 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -299,11 +299,12 @@ static int Init( vout_thread_t *p_vout ) { int i_index; picture_t *p_pic; - video_format_t fmt = {0}; + video_format_t fmt; vout_sys_t *p_sys = p_vout->p_sys; I_OUTPUTPICTURES = 0; /* Initialize the output video format */ + memset( &fmt, 0, sizeof(video_format_t) ); p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; @@ -456,12 +457,14 @@ static void VlcPictureToIplImage( vout_thread_t *p_vout, picture_t *p_in ) int planes = p_in->i_planes; //num input video planes // input video size CvSize sz = cvSize(abs(p_in->format.i_width), abs(p_in->format.i_height)); - video_format_t fmt_out = {0}; + video_format_t fmt_out; clock_t start, finish; //performance measures double duration; int i = 0; vout_sys_t* p_sys = p_vout->p_sys; + memset( &fmt_out, 0, sizeof(video_format_t) ); + start = clock(); //do scale / color conversion according to p_sys config diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index 8dedec1897..cb6bfc93f4 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -135,7 +135,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) uint8_t u,v; picture_t *p_converted; - video_format_t fmt_out = {0}; + video_format_t fmt_out; + memset( &fmt_out, 0, sizeof(video_format_t) ); fmt_out.p_palette = NULL; if( !p_pic ) return NULL; diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c index 0c79ca496e..b6384154b6 100644 --- a/modules/video_filter/puzzle.c +++ b/modules/video_filter/puzzle.c @@ -349,7 +349,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { picture_t *p_outpic; - //video_format_t fmt_out = {0}; + //video_format_t fmt_out; + // memset( &fmt_out, 0, sizeof(video_format_t) ); //picture_t *p_converted; int i_plane; diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c index 3d7070c906..888aeaa212 100644 --- a/modules/visualization/goom.c +++ b/modules/visualization/goom.c @@ -131,7 +131,8 @@ static int Open( vlc_object_t *p_this ) aout_filter_sys_t *p_sys; goom_thread_t *p_thread; vlc_value_t width, height; - video_format_t fmt = {0}; + video_format_t fmt; + if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' ) || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) @@ -161,6 +162,8 @@ static int Open( vlc_object_t *p_this ) var_Create( p_thread, "goom-height", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); var_Get( p_thread, "goom-height", &height ); + memset( &fmt, 0, sizeof(video_format_t) ); + fmt.i_width = fmt.i_visible_width = width.i_int; fmt.i_height = fmt.i_visible_height = height.i_int; fmt.i_chroma = VLC_FOURCC('R','V','3','2'); diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c index 405dee81b6..700827a479 100644 --- a/modules/visualization/visual/visual.c +++ b/modules/visualization/visual/visual.c @@ -188,7 +188,8 @@ static int Open( vlc_object_t *p_this ) vlc_value_t val; char *psz_effects, *psz_parser; - video_format_t fmt = {0}; + video_format_t fmt; + if( ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2') && p_filter->input.i_format != VLC_FOURCC('f','i','3','2') ) ) @@ -302,6 +303,8 @@ static int Open( vlc_object_t *p_this ) } /* Open the video output */ + memset( &fmt, 0, sizeof(video_format_t) ); + fmt.i_width = fmt.i_visible_width = p_sys->i_width; fmt.i_height = fmt.i_visible_height = p_sys->i_height; fmt.i_chroma = VLC_FOURCC('I','4','2','0');