xine_xmalloc() deprecation: replace its use with static and non-zero size.

The xine_xmalloc() function is going to be deprecated, as its
behaviour is rarely needed as such, and it's thus misused.

With this, almost all uses of xine_xmalloc() with static size (for
instance the value returned by sizeof()) or with a size that is
guaranteed not to be zero (like strlen()+1) are replaced with calls to
either calloc(1, ...) or malloc().

malloc() is used whenever the allocated memory is going to be
immediately overwritten, while calloc() is used in every other case,
as it sets the whole memory area to zero.

--HG--
extra : transplant_source : %8F%98%EC%02%1E%83%F0s%06X%83C%205Y%80%B12%CC%E1

24 files changed, 69 insertions, 69 deletions

diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 012db9665..770b75a10 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -106,7 +106,7 @@ static vo_frame_t *aa_alloc_frame(vo_driver_t *this_gen) {
   /* aa_driver_t *this = (aa_driver_t*) this_gen; */
   aa_frame_t  *frame;
 
-  frame = (aa_frame_t *) xine_xmalloc (sizeof (aa_frame_t));
+  frame = calloc(1, sizeof (aa_frame_t));
   if (!frame)
     return NULL;
 
@@ -276,7 +276,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   aa_class_t           *class = (aa_class_t *) class_gen;
   aa_driver_t          *this;
 
-  this = (aa_driver_t*) xine_xmalloc (sizeof (aa_driver_t));
+  this = (aa_driver_t*) calloc(1, sizeof(aa_driver_t));
   
   this->context = (aa_context*) visual_gen;
   
@@ -316,7 +316,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
   /* aa_context    *context = (aa_context*) visual_gen; */
   aa_class_t    *this;
   
-  this = (aa_class_t *) xine_xmalloc(sizeof(aa_class_t));
+  this = calloc(1, sizeof(aa_class_t));
   
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index 866eabcd8..3eec45211 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -120,7 +120,7 @@ static vo_frame_t *caca_alloc_frame(vo_driver_t *this_gen) {
   caca_driver_t *this = (caca_driver_t*) this_gen;
   caca_frame_t  *frame;
 
-  frame = (caca_frame_t *) xine_xmalloc (sizeof (caca_frame_t));
+  frame = calloc(1, sizeof (caca_frame_t));
   if (!frame)
     return NULL;
 
@@ -278,7 +278,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   caca_class_t         *class = (caca_class_t *) class_gen;
   caca_driver_t        *this;
 
-  this = (caca_driver_t*) xine_xmalloc (sizeof (caca_driver_t));
+  this = calloc(1, sizeof (caca_driver_t));
   
   this->config = class->config;
   this->xine   = class->xine;
@@ -322,7 +322,7 @@ static void dispose_class (video_driver_class_t *this_gen) {
 static void *init_class (xine_t *xine, void *visual_gen) {
   caca_class_t    *this;
   
-  this = (caca_class_t *) xine_xmalloc(sizeof(caca_class_t));
+  this = calloc(1, sizeof(caca_class_t));
   
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index e6e333a0c..eea614779 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -232,7 +232,7 @@ static vo_frame_t *directfb_alloc_frame (vo_driver_t *this_gen) {
   directfb_driver_t *this = (directfb_driver_t *) this_gen;
   directfb_frame_t  *frame;
 
-  frame = (directfb_frame_t *) xine_xmalloc (sizeof (directfb_frame_t));
+  frame = (directfb_frame_t *) calloc(1, sizeof(directfb_frame_t));
   if (!frame) {
     xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
              "video_out_directfb: directfb_alloc_frame: out of memory\n");
@@ -1753,7 +1753,7 @@ static vo_driver_t *open_plugin_fb (video_driver_class_t *class_gen, const void
   DFBDisplayLayerID  id;
   DFBResult          ret;
 
-  this = xine_xmalloc (sizeof (directfb_driver_t));
+  this = calloc(1, sizeof(directfb_driver_t));
   if (!this)
     return NULL;
   
@@ -1908,7 +1908,7 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) {
     return NULL;
   }
 
-  this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t));
+  this = (directfb_class_t *) calloc(1, sizeof(directfb_class_t));
   this->driver_class.open_plugin     = open_plugin_fb;
   this->driver_class.get_identifier  = get_identifier_fb;
   this->driver_class.get_description = get_description_fb;
@@ -1939,7 +1939,7 @@ static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void
   DFBDisplayLayerID  id     = DLID_PRIMARY;
   DFBResult          ret;
 
-  this = xine_xmalloc (sizeof (directfb_driver_t));
+  this = calloc(1, sizeof(directfb_driver_t));
   if (!this)
     return NULL;
   
@@ -2127,7 +2127,7 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) {
   if (strcmp (XServerVendor (visual->display), "Denis Oliver Kropp"))
     return NULL;
 
-  this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t));
+  this = (directfb_class_t *) calloc(1, sizeof(directfb_class_t));
   this->driver_class.open_plugin     = open_plugin_x11;
   this->driver_class.get_identifier  = get_identifier_x11;
   this->driver_class.get_description = get_description_x11;
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index 11ee709e1..f1136eab0 100644
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -863,7 +863,7 @@ static vo_frame_t * win32_alloc_frame( vo_driver_t * vo_driver )
 {
   win32_frame_t  *win32_frame;
 
-  win32_frame = ( win32_frame_t * ) xine_xmalloc( sizeof( win32_frame_t ) );
+  win32_frame = calloc(1, sizeof(win32_frame_t));
   if (!win32_frame)
     return NULL;
 
@@ -1183,7 +1183,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi
      /*vo_driver_t *init_video_out_plugin( config_values_t * config, void * win32_visual )*/
 {
   directx_class_t *class = (directx_class_t *)class_gen;
-  win32_driver_t  *win32_driver = ( win32_driver_t * ) xine_xmalloc ( sizeof( win32_driver_t ) );
+  win32_driver_t  *win32_driver = calloc(1, sizeof(win32_driver_t));
 
 
   _x_alphablend_init(&win32_driver->alphablend_extra_data, class->xine);
@@ -1249,7 +1249,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
   /*
    * from this point on, nothing should go wrong anymore
    */
-  directx = (directx_class_t *) xine_xmalloc (sizeof (directx_class_t));
+  directx = calloc(1, sizeof (directx_class_t));
 
   directx->driver_class.open_plugin     = open_plugin;
   directx->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 6a331c910..d67b0870d 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -221,7 +221,7 @@ static vo_frame_t *fb_alloc_frame(vo_driver_t *this_gen)
      this->total_num_native_buffers <= this->used_num_buffers)
     return 0;
 
-  frame = (fb_frame_t *)xine_xmalloc(sizeof(fb_frame_t));
+  frame = calloc(1, sizeof(fb_frame_t));
   if(!frame)
     return NULL;
 
@@ -992,7 +992,7 @@ static vo_driver_t *fb_open_plugin(video_driver_class_t *class_gen,
   config = class->config;
 
   /* allocate plugin struct */
-  this = (fb_driver_t *) xine_xmalloc(sizeof(fb_driver_t));
+  this = calloc(1, sizeof(fb_driver_t));
   if(!this)
     return NULL;
 
@@ -1075,7 +1075,7 @@ static void fb_dispose_class(video_driver_class_t *this_gen)
 
 static void *fb_init_class(xine_t *xine, void *visual_gen)
 {
-  fb_class_t *this = (fb_class_t *)xine_xmalloc(sizeof(fb_class_t));
+  fb_class_t *this = calloc(1, sizeof(fb_class_t));
 
   this->driver_class.open_plugin     = fb_open_plugin;
   this->driver_class.get_identifier  = fb_get_identifier;
diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m
index a13de239f..b5b4d731c 100644
--- a/src/video_out/video_out_macosx.m
+++ b/src/video_out/video_out_macosx.m
@@ -97,7 +97,7 @@ static vo_frame_t *macosx_alloc_frame(vo_driver_t *vo_driver) {
   /* macosx_driver_t *this = (macosx_driver_t *) vo_driver; */
   macosx_frame_t  *frame;
   
-  frame = (macosx_frame_t *) xine_xmalloc(sizeof(macosx_frame_t));
+  frame = calloc(1, sizeof(macosx_frame_t));
   if(!frame)
     return NULL;
 
@@ -320,7 +320,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *
   macosx_driver_t   *driver;
   XineOpenGLView    *view = (XineOpenGLView *) visual;
   
-  driver = (macosx_driver_t *) xine_xmalloc(sizeof(macosx_driver_t));
+  driver = calloc(1, sizeof(macosx_driver_t));
 
   driver->config = class->config;
   driver->xine   = class->xine;
@@ -366,7 +366,7 @@ static void dispose_class (video_driver_class_t *driver_class) {
 static void *init_class (xine_t *xine, void *visual) {
   macosx_class_t        *this;
   
-  this = (macosx_class_t *) xine_xmalloc(sizeof(macosx_class_t));
+  this = calloc(1, sizeof(macosx_class_t));
 
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c
index 5f2424a60..0de6e34e8 100644
--- a/src/video_out/video_out_none.c
+++ b/src/video_out/video_out_none.c
@@ -88,7 +88,7 @@ static vo_frame_t *none_alloc_frame(vo_driver_t *vo_driver) {
   /* none_driver_t *this = (none_driver_t *) vo_driver; */
   none_frame_t  *frame;
   
-  frame = (none_frame_t *) xine_xmalloc(sizeof(none_frame_t));
+  frame = calloc(1, sizeof(none_frame_t));
   if(!frame)
     return NULL;
 
@@ -243,7 +243,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *
   none_class_t    *class = (none_class_t *) driver_class;
   none_driver_t   *driver;
   
-  driver = (none_driver_t *) xine_xmalloc(sizeof(none_driver_t));
+  driver = calloc(1, sizeof(none_driver_t));
   
   driver->config = class->config;
   driver->xine   = class->xine;
@@ -286,7 +286,7 @@ static void dispose_class (video_driver_class_t *driver_class) {
 static void *init_class (xine_t *xine, void *visual) {
   none_class_t        *this;
   
-  this = (none_class_t *) xine_xmalloc(sizeof(none_class_t));
+  this = calloc(1, sizeof(none_class_t));
 
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 54696f452..a82bb8f18 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -1281,7 +1281,7 @@ static vo_frame_t *opengl_alloc_frame (vo_driver_t *this_gen) {
   opengl_frame_t  *frame;
   opengl_driver_t *this = (opengl_driver_t *) this_gen;
 
-  frame = (opengl_frame_t *) xine_xmalloc (sizeof (opengl_frame_t));
+  frame = (opengl_frame_t *) calloc(1, sizeof(opengl_frame_t));
   if (!frame)
     return NULL;
 
@@ -1820,7 +1820,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
   char                **render_fun_names;
   int                   i;
   
-  this = (opengl_driver_t *) xine_xmalloc (sizeof (opengl_driver_t));
+  this = (opengl_driver_t *) calloc(1, sizeof(opengl_driver_t));
 
   if (!this)
     return NULL;
@@ -1970,7 +1970,7 @@ static void opengl_dispose_class (video_driver_class_t *this_gen) {
 }
 
 static void *opengl_init_class (xine_t *xine, void *visual_gen) {
-  opengl_class_t	       *this = (opengl_class_t *) xine_xmalloc (sizeof (opengl_class_t));
+  opengl_class_t	       *this = (opengl_class_t *) calloc(1, sizeof(opengl_class_t));
 
   this->driver_class.open_plugin     = opengl_open_plugin;
   this->driver_class.get_identifier  = opengl_get_identifier;
diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c
index d903efc89..45a54cc76 100644
--- a/src/video_out/video_out_pgx32.c
+++ b/src/video_out/video_out_pgx32.c
@@ -386,7 +386,7 @@ static vo_frame_t *pgx32_alloc_frame(vo_driver_t *this_gen)
   /*pgx32_driver_t *this = (pgx32_driver_t *)(void *)this_gen;*/
   pgx32_frame_t *frame;
 
-  frame = (pgx32_frame_t *) xine_xmalloc(sizeof(pgx32_frame_t));
+  frame = calloc(1, sizeof(pgx32_frame_t));
   if (!frame) {
     return NULL;
   }
@@ -800,7 +800,7 @@ static vo_driver_t *pgx32_init_driver(video_driver_class_t *class_gen, const voi
   pgx32_driver_class_t *class = (pgx32_driver_class_t *)(void *)class_gen;
   pgx32_driver_t *this;
 
-  this = (pgx32_driver_t *)xine_xmalloc(sizeof(pgx32_driver_t));
+  this = calloc(1, sizeof(pgx32_driver_t));
   if (!this) {
     return NULL;
   }
@@ -869,7 +869,7 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen)
 {
   pgx32_driver_class_t *class;
 
-  class = (pgx32_driver_class_t *)xine_xmalloc(sizeof(pgx32_driver_class_t));
+  class = calloc(1, sizeof(pgx32_driver_class_t));
   if (!class) {
     return NULL;
   }
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 4abb794d7..abda51e2b 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -561,7 +561,7 @@ static vo_frame_t *pgx64_alloc_frame(vo_driver_t *this_gen)
   /*pgx64_driver_t *this = (pgx64_driver_t *)(void *)this_gen;*/
   pgx64_frame_t *frame;
 
-  frame = (pgx64_frame_t *) xine_xmalloc(sizeof(pgx64_frame_t));
+  frame = calloc(1, sizeof(pgx64_frame_t));
   if (!frame) {
     return NULL;
   }
@@ -1352,7 +1352,7 @@ static vo_driver_t *pgx64_init_driver(video_driver_class_t *class_gen, const voi
   struct fbgattr attr;
   long page_size;
 
-  this = (pgx64_driver_t *)xine_xmalloc(sizeof(pgx64_driver_t));
+  this = calloc(1, sizeof(pgx64_driver_t));
   if (!this) {
     return NULL;
   }
@@ -1493,7 +1493,7 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen)
 {
   pgx64_driver_class_t *class;
 
-  class = (pgx64_driver_class_t *)xine_xmalloc(sizeof(pgx64_driver_class_t));
+  class = calloc(1, sizeof(pgx64_driver_class_t));
   if (!class) {
     return NULL;
   }
diff --git a/src/video_out/video_out_raw.c b/src/video_out/video_out_raw.c
index 29d93d794..45cfc1eda 100644
--- a/src/video_out/video_out_raw.c
+++ b/src/video_out/video_out_raw.c
@@ -292,7 +292,7 @@ static vo_frame_t *raw_alloc_frame (vo_driver_t *this_gen)
   raw_frame_t  *frame;
   raw_driver_t *this = (raw_driver_t *) this_gen;
 
-  frame = (raw_frame_t *) xine_xmalloc (sizeof (raw_frame_t));
+  frame = (raw_frame_t *) calloc(1, sizeof(raw_frame_t));
 
   if (!frame)
     return NULL;
@@ -505,7 +505,7 @@ static vo_driver_t *raw_open_plugin (video_driver_class_t *class_gen, const void
   raw_driver_t      *this;
   int i;
 
-  this = (raw_driver_t *) xine_xmalloc (sizeof (raw_driver_t));
+  this = (raw_driver_t *) calloc(1, sizeof(raw_driver_t));
 
   if (!this)
     return NULL;
@@ -580,7 +580,7 @@ static void raw_dispose_class (video_driver_class_t *this_gen)
 
 static void *raw_init_class (xine_t *xine, void *visual_gen)
 {
-  raw_class_t *this = (raw_class_t *) xine_xmalloc (sizeof (raw_class_t));
+  raw_class_t *this = (raw_class_t *) calloc(1, sizeof(raw_class_t));
 
   this->driver_class.open_plugin     = raw_open_plugin;
   this->driver_class.get_identifier  = raw_get_identifier;
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 6705b4176..b53d1d31c 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -138,7 +138,7 @@ static vo_frame_t *sdl_alloc_frame (vo_driver_t *this_gen) {
   /* sdl_driver_t    *this = (sdl_driver_t *) this_gen; */
   sdl_frame_t     *frame ;
 
-  frame = (sdl_frame_t *) xine_xmalloc (sizeof (sdl_frame_t));
+  frame = (sdl_frame_t *) calloc(1, sizeof(sdl_frame_t));
 
   if (!frame)
     return NULL;
@@ -475,7 +475,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   XWindowAttributes     window_attributes;
 #endif
   
-  this = (sdl_driver_t *) xine_xmalloc (sizeof (sdl_driver_t));
+  this = (sdl_driver_t *) calloc(1, sizeof(sdl_driver_t));
   if (!this)
     return NULL;
 
@@ -596,7 +596,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
   }
   SDL_QuitSubSystem (SDL_INIT_VIDEO);
 
-  this = (sdl_class_t*) xine_xmalloc (sizeof (sdl_class_t));
+  this = (sdl_class_t*) calloc(1, sizeof(sdl_class_t));
    
   this->driver_class.open_plugin      = open_plugin;
   this->driver_class.get_identifier   = get_identifier;
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
index dfc4ae385..00dd80251 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.c
@@ -133,7 +133,7 @@ static vo_frame_t *stk_alloc_frame(vo_driver_t *this_gen) {
     stk_frame_t* frame;
 
     //printf("video_out_stk: alloc_frame()\n");
-    frame = (stk_frame_t *) xine_xmalloc(sizeof(stk_frame_t));
+    frame = calloc(1, sizeof(stk_frame_t));
     if (!frame)
       return NULL;
 
@@ -389,7 +389,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
     
     //printf("video_out_stk: open_plugin()\n");
     
-    this = (stk_driver_t *) xine_xmalloc (sizeof (stk_driver_t));
+    this = calloc(1, sizeof (stk_driver_t));
     if (!this)
       return NULL;
 
@@ -463,7 +463,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
     
     //printf("video_out_stk: init_class()\n");
 
-    this = (stk_class_t *) xine_xmalloc(sizeof(stk_class_t));
+    this = calloc(1, sizeof(stk_class_t));
 
     this->driver_class.open_plugin      = open_plugin;
     this->driver_class.get_identifier   = get_identifier;
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index b1fadbd58..f66817f36 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -478,7 +478,7 @@ static vo_frame_t* syncfb_alloc_frame(vo_driver_t* this_gen)
   /* syncfb_driver_t *this = (syncfb_driver_t *) this_gen; */
   syncfb_frame_t  *frame;
   
-  frame = (syncfb_frame_t *) xine_xmalloc(sizeof(syncfb_frame_t));
+  frame = calloc(1, sizeof(syncfb_frame_t));
   if(!frame)
     return NULL;
   
@@ -882,7 +882,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 
    display     = visual->display;
    
-   if(!(this = xine_xmalloc(sizeof (syncfb_driver_t))))
+   if(!(this = calloc(1, sizeof (syncfb_driver_t))))
      return NULL;
  
    _x_alphablend_init(&this->alphablend_extra_data, class->xine);
@@ -1105,7 +1105,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
   /*
    * from this point on, nothing should go wrong anymore
    */
-  this = (syncfb_class_t *) xine_xmalloc (sizeof (syncfb_class_t));
+  this = calloc(1, sizeof (syncfb_class_t));
 
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 9e3f870b1..482841a09 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -370,7 +370,7 @@ static vo_frame_t *vidix_alloc_frame (vo_driver_t *this_gen) {
   /* vidix_driver_t  *this = (vidix_driver_t *) this_gen; */
   vidix_frame_t   *frame ;
 
-  frame = (vidix_frame_t *) xine_xmalloc (sizeof (vidix_frame_t));
+  frame = (vidix_frame_t *) calloc(1, sizeof(vidix_frame_t));
   if (!frame)
     return NULL;
 
@@ -947,7 +947,7 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) {
   vidix_driver_t       *this;
   int                   err;
     
-  this = (vidix_driver_t *) xine_xmalloc (sizeof (vidix_driver_t));
+  this = (vidix_driver_t *) calloc(1, sizeof(vidix_driver_t));
   if (!this)
     return NULL;
 
@@ -1089,7 +1089,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
   vidix_class_t        *this;
   int                   err;
   
-  this = (vidix_class_t *) xine_xmalloc (sizeof (vidix_class_t));
+  this = (vidix_class_t *) calloc(1, sizeof(vidix_class_t));
   if (!this)
     return NULL;
   
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index 2ac579555..a5282a24f 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -295,7 +295,7 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) {
   xshm_frame_t  *frame;
   xshm_driver_t *this = (xshm_driver_t *) this_gen;
 
-  frame = (xshm_frame_t *) xine_xmalloc (sizeof (xshm_frame_t));
+  frame = (xshm_frame_t *) calloc(1, sizeof(xshm_frame_t));
   if (!frame)
     return NULL;
 
@@ -1015,7 +1015,7 @@ static vo_driver_t *xshm_open_plugin(video_driver_class_t *class_gen, const void
 
   const xcb_query_extension_reply_t *query_extension_reply;
   
-  this = (xshm_driver_t *) xine_xmalloc (sizeof (xshm_driver_t));
+  this = (xshm_driver_t *) calloc(1, sizeof(xshm_driver_t));
 
   if (!this)
     return NULL;
@@ -1250,7 +1250,7 @@ static void xshm_dispose_class (video_driver_class_t *this_gen) {
 }
 
 static void *xshm_init_class (xine_t *xine, void *visual_gen) {
-  xshm_class_t	       *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t));
+  xshm_class_t	       *this = (xshm_class_t *) calloc(1, sizeof(xshm_class_t));
 
   this->driver_class.open_plugin     = xshm_open_plugin;
   this->driver_class.get_identifier  = xshm_get_identifier;
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index f83512bd0..a4a3c3812 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -186,7 +186,7 @@ static vo_frame_t *xv_alloc_frame (vo_driver_t *this_gen) {
   /* xv_driver_t  *this = (xv_driver_t *) this_gen; */
   xv_frame_t   *frame ;
 
-  frame = (xv_frame_t *) xine_xmalloc (sizeof (xv_frame_t));
+  frame = (xv_frame_t *) calloc(1, sizeof(xv_frame_t));
   if (!frame)
     return NULL;
   
@@ -1295,7 +1295,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
   xcb_xv_adaptor_info_iterator_t adaptor_it;
   xcb_xv_image_format_info_iterator_t format_it;
 
-  this = (xv_driver_t *) xine_xmalloc (sizeof (xv_driver_t));
+  this = (xv_driver_t *) calloc(1, sizeof(xv_driver_t));
   if (!this)
     return NULL;
 
@@ -1629,7 +1629,7 @@ static void dispose_class (video_driver_class_t *this_gen) {
 }
 
 static void *init_class (xine_t *xine, void *visual_gen) {
-  xv_class_t        *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t));
+  xv_class_t        *this = (xv_class_t *) calloc(1, sizeof(xv_class_t));
 
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index ec97aa5c1..74791f145 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -387,7 +387,7 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) {
   xshm_frame_t  *frame;
   xshm_driver_t *this = (xshm_driver_t *) this_gen;
 
-  frame = (xshm_frame_t *) xine_xmalloc (sizeof (xshm_frame_t));
+  frame = (xshm_frame_t *) calloc(1, sizeof(xshm_frame_t));
   if (!frame)
     return NULL;
 
@@ -1083,7 +1083,7 @@ static vo_driver_t *xshm_open_plugin_2 (video_driver_class_t *class_gen, const v
   int			cpu_byte_order;
   XColor                dummy;
   
-  this = (xshm_driver_t *) xine_xmalloc (sizeof (xshm_driver_t));
+  this = (xshm_driver_t *) calloc(1, sizeof(xshm_driver_t));
 
   if (!this)
     return NULL;
@@ -1310,7 +1310,7 @@ static void xshm_dispose_class (video_driver_class_t *this_gen) {
 }
 
 static void *xshm_init_class (xine_t *xine, void *visual_gen) {
-  xshm_class_t	       *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t));
+  xshm_class_t	       *this = (xshm_class_t *) calloc(1, sizeof(xshm_class_t));
 
   this->driver_class.open_plugin     = xshm_open_plugin_old;
   this->driver_class.get_identifier  = xshm_get_identifier;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 65559c16f..e1f6d0de0 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -208,7 +208,7 @@ static vo_frame_t *xv_alloc_frame (vo_driver_t *this_gen) {
   /* xv_driver_t  *this = (xv_driver_t *) this_gen; */
   xv_frame_t   *frame ;
 
-  frame = (xv_frame_t *) xine_xmalloc (sizeof (xv_frame_t));
+  frame = (xv_frame_t *) calloc(1, sizeof(xv_frame_t));
   if (!frame)
     return NULL;
   
@@ -1340,7 +1340,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
   XvAdaptorInfo        *adaptor_info;
   unsigned int          adaptor_num;
 
-  this = (xv_driver_t *) xine_xmalloc (sizeof (xv_driver_t));
+  this = (xv_driver_t *) calloc(1, sizeof(xv_driver_t));
   if (!this)
     return NULL;
 
@@ -1712,7 +1712,7 @@ static void dispose_class (video_driver_class_t *this_gen) {
 }
 
 static void *init_class (xine_t *xine, void *visual_gen) {
-  xv_class_t        *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t));
+  xv_class_t        *this = (xv_class_t *) calloc(1, sizeof(xv_class_t));
 
   this->driver_class.open_plugin     = open_plugin_old;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index a17e4d6a0..890e079a6 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -556,7 +556,7 @@ static vo_frame_t *xvmc_alloc_frame (vo_driver_t *this_gen) {
 
   lprintf ("xvmc_alloc_frame\n");
 
-  frame = (xvmc_frame_t *) xine_xmalloc (sizeof (xvmc_frame_t));
+  frame = calloc(1, (sizeof (xvmc_frame_t));
 
   if (!frame)
     return NULL;
@@ -595,8 +595,8 @@ static cxid_t *xvmc_set_context (xvmc_driver_t *this,
   
   /* initialize block & macro block pointers first time */
   if(macroblocks->blocks == NULL ||  macroblocks->macro_blocks == NULL) {
-    macroblocks->blocks       = xine_xmalloc(sizeof(XvMCBlockArray));
-    macroblocks->macro_blocks = xine_xmalloc(sizeof(XvMCMacroBlockArray));
+    macroblocks->blocks       = calloc(1, sizeof(XvMCBlockArray));
+    macroblocks->macro_blocks = calloc(1, sizeof(XvMCMacroBlockArray));
     
     lprintf("macroblocks->blocks %lx ->macro_blocks %lx\n",
 	    macroblocks->blocks,macroblocks->macro_blocks);
@@ -1348,7 +1348,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   display = visual->display;
   
   /* TODO ???  */
-  this = (xvmc_driver_t *) xine_xmalloc (sizeof (xvmc_driver_t));
+  this = calloc(1, sizeof (xvmc_driver_t));
   
   if (!this)
     return NULL;
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index 28679e95d..07dafa12d 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -550,7 +550,7 @@ static vo_frame_t *xxmc_alloc_frame (vo_driver_t *this_gen) {
   xxmc_driver_t  *this = (xxmc_driver_t *) this_gen; 
   xxmc_frame_t   *frame ;
 
-  frame = (xxmc_frame_t *) xine_xmalloc (sizeof (xxmc_frame_t));
+  frame = calloc(1, sizeof (xxmc_frame_t));
   if (!frame)
     return NULL;
   
@@ -2373,7 +2373,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   int                   use_more_frames;
   int                   use_unscaled;
 
-  this = (xxmc_driver_t *) xine_xmalloc (sizeof (xxmc_driver_t));
+  this = calloc(1, sizeof (xxmc_driver_t));
   if (!this)
     return NULL;
 
@@ -2744,7 +2744,7 @@ static void dispose_class (video_driver_class_t *this_gen) {
 }
 
 static void *init_class (xine_t *xine, void *visual_gen) {
-  xxmc_class_t        *this = (xxmc_class_t *) xine_xmalloc (sizeof (xxmc_class_t));
+  xxmc_class_t        *this = calloc(1, sizeof (xxmc_class_t));
 
   this->driver_class.open_plugin     = open_plugin;
   this->driver_class.get_identifier  = get_identifier;
diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c
index e0cb6f1f6..4d0e46287 100644
--- a/src/video_out/x11osd.c
+++ b/src/video_out/x11osd.c
@@ -245,7 +245,7 @@ x11osd_create (xine_t *xine, Display *display, int screen, Window window, enum x
   XSetWindowAttributes  attr;
   XWindowAttributes getattr;
 
-  osd = xine_xmalloc (sizeof (x11osd));
+  osd = calloc(1, sizeof(x11osd));
   if (!osd)
     return NULL;
 
diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c
index 4bb2b60af..d8cf119a2 100644
--- a/src/video_out/xcbosd.c
+++ b/src/video_out/xcbosd.c
@@ -238,7 +238,7 @@ xcbosd *xcbosd_create(xine_t *xine, xcb_connection_t *connection, xcb_screen_t *
   xcb_void_cookie_t generic_cookie;
   xcb_generic_error_t *generic_error;
 
-  osd = xine_xmalloc (sizeof (xcbosd));
+  osd = calloc(1, sizeof(xcbosd));
   if (!osd)
     return NULL;
 
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index c98dd518f..fb2d63e6c 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -3144,7 +3144,7 @@ static void yuy22rgb_c_init (yuv2rgb_factory_t *this)
 
 static yuv2rgb_t *yuv2rgb_create_converter (yuv2rgb_factory_t *factory) {
 
-  yuv2rgb_t *this = xine_xmalloc (sizeof (yuv2rgb_t));
+  yuv2rgb_t *this = calloc(1, sizeof(yuv2rgb_t));
 
   this->swapped			 = factory->swapped;
   this->cmap                     = factory->cmap;