Commit c09b9f61 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Should fix another bunch of: (near initialization for `fmt*') warnings.

parent e52e4641
...@@ -299,11 +299,12 @@ static int Init( vout_thread_t *p_vout ) ...@@ -299,11 +299,12 @@ static int Init( vout_thread_t *p_vout )
{ {
int i_index; int i_index;
picture_t *p_pic; picture_t *p_pic;
video_format_t fmt = {0}; video_format_t fmt;
vout_sys_t *p_sys = p_vout->p_sys; vout_sys_t *p_sys = p_vout->p_sys;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
/* Initialize the output video format */ /* 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_chroma = p_vout->render.i_chroma;
p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_width = p_vout->render.i_width;
p_vout->output.i_height = p_vout->render.i_height; 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 ) ...@@ -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 int planes = p_in->i_planes; //num input video planes
// input video size // input video size
CvSize sz = cvSize(abs(p_in->format.i_width), abs(p_in->format.i_height)); 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 clock_t start, finish; //performance measures
double duration; double duration;
int i = 0; int i = 0;
vout_sys_t* p_sys = p_vout->p_sys; vout_sys_t* p_sys = p_vout->p_sys;
memset( &fmt_out, 0, sizeof(video_format_t) );
start = clock(); start = clock();
//do scale / color conversion according to p_sys config //do scale / color conversion according to p_sys config
......
...@@ -135,7 +135,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -135,7 +135,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
uint8_t u,v; uint8_t u,v;
picture_t *p_converted; 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; fmt_out.p_palette = NULL;
if( !p_pic ) return NULL; if( !p_pic ) return NULL;
......
...@@ -349,7 +349,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -349,7 +349,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{ {
picture_t *p_outpic; 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; //picture_t *p_converted;
int i_plane; int i_plane;
......
...@@ -131,7 +131,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -131,7 +131,8 @@ static int Open( vlc_object_t *p_this )
aout_filter_sys_t *p_sys; aout_filter_sys_t *p_sys;
goom_thread_t *p_thread; goom_thread_t *p_thread;
vlc_value_t width, height; 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' ) if ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2' )
|| p_filter->output.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 ) ...@@ -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_Create( p_thread, "goom-height", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
var_Get( p_thread, "goom-height", &height ); 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_width = fmt.i_visible_width = width.i_int;
fmt.i_height = fmt.i_visible_height = height.i_int; fmt.i_height = fmt.i_visible_height = height.i_int;
fmt.i_chroma = VLC_FOURCC('R','V','3','2'); fmt.i_chroma = VLC_FOURCC('R','V','3','2');
......
...@@ -188,7 +188,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -188,7 +188,8 @@ static int Open( vlc_object_t *p_this )
vlc_value_t val; vlc_value_t val;
char *psz_effects, *psz_parser; 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') && if( ( p_filter->input.i_format != VLC_FOURCC('f','l','3','2') &&
p_filter->input.i_format != VLC_FOURCC('f','i','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 ) ...@@ -302,6 +303,8 @@ static int Open( vlc_object_t *p_this )
} }
/* Open the video output */ /* Open the video output */
memset( &fmt, 0, sizeof(video_format_t) );
fmt.i_width = fmt.i_visible_width = p_sys->i_width; fmt.i_width = fmt.i_visible_width = p_sys->i_width;
fmt.i_height = fmt.i_visible_height = p_sys->i_height; fmt.i_height = fmt.i_visible_height = p_sys->i_height;
fmt.i_chroma = VLC_FOURCC('I','4','2','0'); fmt.i_chroma = VLC_FOURCC('I','4','2','0');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment