From 8cac504efa90e15b2b920fc88fb5e2a104b54496 Mon Sep 17 00:00:00 2001
From: phintuka <phintuka>
Date: Thu, 22 May 2008 09:56:03 +0000
Subject: xine_xmalloc -> calloc

---
 xine_post_audiochannel.c | 6 +++---
 xine_post_autocrop.c     | 8 ++++----
 xine_post_swscale.c      | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xine_post_audiochannel.c b/xine_post_audiochannel.c
index 3d1ad609..9326162b 100644
--- a/xine_post_audiochannel.c
+++ b/xine_post_audiochannel.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_post_audiochannel.c,v 1.5 2008-01-02 01:55:19 phintuka Exp $
+ * $Id: xine_post_audiochannel.c,v 1.6 2008-05-22 09:56:02 phintuka Exp $
  *
  */
 
@@ -222,7 +222,7 @@ static post_plugin_t *audioch_open_plugin(post_class_t *class_gen,
 					  xine_audio_port_t **audio_target,
 					  xine_video_port_t **video_target)
 {
-  audioch_post_plugin_t *this = (audioch_post_plugin_t*)xine_xmalloc(sizeof(audioch_post_plugin_t));
+  audioch_post_plugin_t *this = calloc(1, sizeof(audioch_post_plugin_t));
   post_in_t             *input;
   post_out_t            *output;
   post_audio_port_t     *port;
@@ -292,7 +292,7 @@ static void audioch_class_dispose(post_class_t *class_gen)
 
 static void *audioch_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t*)malloc(sizeof(post_class_t));
+  post_class_t *class = calloc(1, sizeof(post_class_t));
   
   if(!class)
     return NULL;
diff --git a/xine_post_autocrop.c b/xine_post_autocrop.c
index 26edcaf6..3a90f1e2 100644
--- a/xine_post_autocrop.c
+++ b/xine_post_autocrop.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_post_autocrop.c,v 1.12 2008-01-02 01:55:19 phintuka Exp $
+ * $Id: xine_post_autocrop.c,v 1.13 2008-05-22 09:56:03 phintuka Exp $
  *
  */
 
@@ -27,7 +27,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_post_autocrop.c,v 1.12 2008-01-02 01:55:19 phintuka Exp $
+ * $Id: xine_post_autocrop.c,v 1.13 2008-05-22 09:56:03 phintuka Exp $
  *
  * autocrop video filter by Petri Hintukainen 25/03/2006
  *
@@ -1512,7 +1512,7 @@ static post_plugin_t *autocrop_open_plugin(post_class_t *class_gen,
 					    xine_video_port_t **video_target)
 {
   if (video_target && video_target[ 0 ]) {
-    autocrop_post_plugin_t *this = (autocrop_post_plugin_t*)xine_xmalloc(sizeof(autocrop_post_plugin_t));
+    autocrop_post_plugin_t *this = calloc(1, sizeof(autocrop_post_plugin_t));
     post_in_t           *input;
     post_out_t          *output;
     post_video_port_t   *port;
@@ -1594,7 +1594,7 @@ static void autocrop_class_dispose(post_class_t *class_gen)
 
 static void *autocrop_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t*)malloc(sizeof(post_class_t));
+  post_class_t *class = calloc(1, sizeof(post_class_t));
   
   if(class) {
     class->open_plugin     = autocrop_open_plugin;
diff --git a/xine_post_swscale.c b/xine_post_swscale.c
index 26ca43fc..9ef6685e 100644
--- a/xine_post_swscale.c
+++ b/xine_post_swscale.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_post_swscale.c,v 1.7 2008-03-13 23:08:18 phintuka Exp $
+ * $Id: xine_post_swscale.c,v 1.8 2008-05-22 09:56:03 phintuka Exp $
  *
  * Simple (faster) resize for avisynth
  *     Copyright (C) 2002 Tom Barry
@@ -1392,8 +1392,8 @@ static void init_tables(warp_plugin_t *this)
 #define BP(x) ((uint8_t*)(x))
   /* allocate memory for scaling tables and workspace */
   free(this->pMem);
-  this->pMem = xine_xmalloc(this->input_width*3 + this->output_width*sizeof(uint32_t)*3*2 +
-			    this->output_height*sizeof(uint32_t)*4 + 2*9*128);
+  this->pMem = malloc(this->input_width*3 + this->output_width*sizeof(uint32_t)*3*2 +
+		      this->output_height*sizeof(uint32_t)*4 + 2*9*128);
 
   /* - aligned for P4 cache line */
   this->vWorkY   = (uint32_t*)ALIGN(128, this->pMem);
@@ -1492,7 +1492,7 @@ static post_plugin_t *open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target)
 {
-  warp_plugin_t     *this     = (warp_plugin_t *) xine_xmalloc(sizeof(warp_plugin_t));
+  warp_plugin_t     *this     = calloc(1, sizeof(warp_plugin_t));
   post_plugin_t     *this_gen = (post_plugin_t *) this;
   post_in_t         *input;
   post_out_t        *output;
-- 
cgit v1.2.3