Removes trailing spaces. Removes tabs.

[vlc] / modules / video_filter / opencv_wrapper.c

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index b67e1bfb388cf2c0e8de6e4e162a956befced8c7..cc87e629b152974b65932f25233dca7bf6a8305b 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -23,8 +23,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <cxcore.h>
 #include <cv.h>
@@ -299,11 +297,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 +455,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
@@ -591,7 +592,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
 
     ReleaseImages(p_vout);
     vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
-       
+    
     vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
     vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
 }