Remove stdlib.h

[vlc] / modules / video_filter / magnify.c

diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index 733be1d06959d1df5888ee1d7a58a5df5bd411c5..aee22fad18b21a84543fa21d8cbcef190fbe8ec9 100644 (file)
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
 #include <vlc/vlc.h>
@@ -122,8 +121,9 @@ static int Init( vout_thread_t *p_vout )
 {
     int i_index;
     picture_t *p_pic;
-    video_format_t fmt = {0};
+    video_format_t fmt;
 
+    memset( &fmt, 0, sizeof(video_format_t) );
     I_OUTPUTPICTURES = 0;
 
     /* Initialize the output structure */
@@ -152,6 +152,7 @@ static int Init( vout_thread_t *p_vout )
     p_vout->p_sys->i_y = 0;
 #define ZOOM_FACTOR 100
     p_vout->p_sys->i_zoom = 200;
+    p_vout->p_sys->b_visible = VLC_TRUE;
 
     var_AddCallback( p_vout->p_sys->p_vout, "mouse-x", MouseEvent, p_vout );
     var_AddCallback( p_vout->p_sys->p_vout, "mouse-y", MouseEvent, p_vout );
@@ -217,10 +218,11 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     int o_zoom = p_vout->p_sys->i_zoom;
     int x,y,o_yp,o_xp;
     int v_w, v_h;
-    video_format_t fmt_out = {0};
+    video_format_t fmt_out;
     picture_t *p_converted;
     plane_t *p_oyp=NULL;
 
+    memset( &fmt_out, 0, sizeof(video_format_t) );
     /* This is a new frame. Get a structure from the video_output. */
     while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
               == NULL )
@@ -261,7 +263,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     else
     {
 #define copy( plane ) \
-        memcpy( p_outpic->p[plane].p_pixels, p_pic->p[plane].p_pixels, \
+        p_vout->p_libvlc-> \
+        pf_memcpy( p_outpic->p[plane].p_pixels, p_pic->p[plane].p_pixels, \
             p_outpic->p[plane].i_lines * p_outpic->p[plane].i_pitch );
         copy( Y_PLANE );
         copy( U_PLANE );
@@ -280,7 +283,8 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     #define copyimage( plane ) \
         for( y=0; y<p_converted->p[plane].i_visible_lines; y++) \
         { \
-            memcpy( p_outpic->p[plane].p_pixels+y*p_outpic->p[plane].i_pitch, \
+            p_vout->p_libvlc->pf_memcpy( \
+            p_outpic->p[plane].p_pixels+y*p_outpic->p[plane].i_pitch, \
             p_converted->p[plane].p_pixels+y*p_converted->p[plane].i_pitch, \
             p_converted->p[plane].i_visible_pitch ); \
         }
@@ -294,9 +298,9 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
         v_w = p_oyp->i_pitch*ZOOM_FACTOR/(VIS_ZOOM*o_zoom);
         v_h = (o_y+p_oyp->i_lines*ZOOM_FACTOR/o_zoom)/VIS_ZOOM;
         /* top line */
-        memset( p_oyp->p_pixels
-                + o_y/VIS_ZOOM*p_oyp->i_pitch
-                + o_x/VIS_ZOOM, 0xff, v_w+1 );
+        p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
+                                     + o_y/VIS_ZOOM*p_oyp->i_pitch
+                                     + o_x/VIS_ZOOM, 0xff, v_w+1 );
 
         for( y = o_y/VIS_ZOOM+1; y < v_h; y++ )
         {
@@ -310,9 +314,9 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
             ] = 0xff;
         }
         /* bottom line */
-        memset( p_oyp->p_pixels
-                + v_h*p_oyp->i_pitch
-                + o_x/VIS_ZOOM, 0xff, v_w+1 );
+        p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
+                                     + v_h*p_oyp->i_pitch
+                                     + o_x/VIS_ZOOM, 0xff, v_w+1 );
 
         /* */
         v_h = p_oyp->i_lines/VIS_ZOOM;
@@ -353,18 +357,18 @@ o o X o o o X X X X X o o X X X X o o o X X X X X o o X X X o o o X X X o o X o
     if( p_vout->p_sys->b_visible )
     {
         /* zoom gauge */
-        memset( p_oyp->p_pixels
-                    + (v_h+9)*p_oyp->i_pitch,
-                    0xff, 41 );
+        p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
+                                     + (v_h+9)*p_oyp->i_pitch,
+                                     0xff, 41 );
         for( y = v_h + 10; y < v_h + 90; y++ )
         {
             int width = v_h + 90 - y;
             width = (width*width)/160;
             if( (80 - y + v_h)*10 < o_zoom )
             {
-                memset( p_oyp->p_pixels
-                    + y*p_oyp->i_pitch,
-                    0xff, width );
+                p_vout->p_libvlc->pf_memset( p_oyp->p_pixels
+                                             + y*p_oyp->i_pitch,
+                                             0xff, width );
             }
             else
             {