4 files changed, 25 insertions, 26 deletions

diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index 5a0382895..c082eefa6 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -152,10 +152,10 @@ static void stretchscr_exit (scr_plugin_t *scr) {
   free(this);
 }
 
-static stretchscr_t* stretchscr_init (double *stretch_factor) {
+static stretchscr_t *XINE_MALLOC stretchscr_init (double *stretch_factor) {
   stretchscr_t *this;
 
-  this = (stretchscr_t *) xine_xmalloc(sizeof(stretchscr_t));
+  this = calloc(1, sizeof(stretchscr_t));
 
   this->scr.interface_version = 3;
   this->scr.get_priority      = stretchscr_get_priority;
@@ -620,7 +620,7 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target)
 {
-  post_plugin_stretch_t *this  = (post_plugin_stretch_t *)xine_xmalloc(sizeof(post_plugin_stretch_t));
+  post_plugin_stretch_t *this  = calloc(1, sizeof(post_plugin_stretch_t));
   post_in_t            *input;
   post_out_t           *output;
   xine_post_in_t       *input_api;
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index 573354450..3e5c2e65b 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -181,7 +181,7 @@ static int upmix_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream,
   }
 
   pthread_mutex_lock (&this->lock);
-  this->sub = xine_xmalloc(sizeof(af_sub_t));
+  this->sub = calloc(1, sizeof(af_sub_t));
   if (!this->sub) {
     pthread_mutex_unlock (&this->lock);
     return 0;
@@ -379,7 +379,7 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target)
 {
-  post_plugin_upmix_t *this  = (post_plugin_upmix_t *)xine_xmalloc(sizeof(post_plugin_upmix_t));
+  post_plugin_upmix_t *this  = calloc(1, sizeof(post_plugin_upmix_t));
   post_in_t            *input;
   post_out_t           *output;
   xine_post_in_t       *input_api;
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index 82ceb1877..193989586 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -192,32 +192,32 @@ static void upmix_mono_port_put_buffer(xine_audio_port_t *port_gen,
     _x_extra_info_merge(buf1->extra_info, buf->extra_info);
 
     {
-      int step = buf->format.bits / 8;
+      const size_t step = buf->format.bits / 8;
       uint8_t *src  = (uint8_t *)buf->mem;
       uint8_t *dst0 = (uint8_t *)buf0->mem;
       uint8_t *dst1 = (uint8_t *)buf1->mem;
 
-      int i, k;
+      int i;
       for (i = 0; i < buf->num_frames / 2; i++)
       {
-        for (k = 0; k < step; k++)
-          *dst0++ = *src++;
+	memcpy(dst0, src, step);
+	dst0 += step;
 
-        src -= step;
+	memcpy(dst0, src, step);
+	dst0 += step;
 
-        for (k = 0; k < step; k++)
-          *dst0++ = *src++;
+	src += step;
       }
 
       for (i = buf->num_frames / 2; i < buf->num_frames; i++)
       {
-        for (k = 0; k < step; k++)
-          *dst1++ = *src++;
+	memcpy(dst1, src, step);
+	dst1 += step;
 
-        src -= step;
+	memcpy(dst1, src, step);
+	dst1 += step;
 
-        for (k = 0; k < step; k++)
-          *dst1++ = *src++;
+	src += step;
       }
     }
 
@@ -244,11 +244,11 @@ static void upmix_mono_port_put_buffer(xine_audio_port_t *port_gen,
     _x_extra_info_merge(buf0->extra_info, buf->extra_info);
 
     {
-      int step = buf->format.bits / 8;
+      const size_t step = buf->format.bits / 8;
       uint8_t *src  = (uint8_t *)buf->mem;
       uint8_t *dst0 = (uint8_t *)buf0->mem;
       int cur_channel = this->params.channel;
-      int i, j, k;
+      int i, j;
       
       if( cur_channel >= this->channels )
         cur_channel = this->channels-1;
@@ -259,8 +259,8 @@ static void upmix_mono_port_put_buffer(xine_audio_port_t *port_gen,
       {
         for (j = 0; j < this->channels; j++ )
         {
-          for (k = 0; k < step; k++)
-            *dst0++ = *(src+k);
+	  memcpy(dst0, src, step);
+	  dst0 += step;
         }
         src += this->channels * step;
       }
@@ -293,7 +293,7 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs
                                              xine_audio_port_t **audio_target,
                                              xine_video_port_t **video_target)
 {
-  post_plugin_upmix_mono_t *this = (post_plugin_upmix_mono_t *)xine_xmalloc(sizeof(post_plugin_upmix_mono_t));
+  post_plugin_upmix_mono_t *this = calloc(1, sizeof(post_plugin_upmix_mono_t));
   post_in_t                *input;
   post_out_t               *output;
   xine_post_in_t       *input_api;
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
index de4ebde87..9ea774564 100644
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -407,7 +407,7 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs,
                                           xine_audio_port_t **audio_target,
                                           xine_video_port_t **video_target)
 {
-    post_plugin_volnorm_t *this  = (post_plugin_volnorm_t *)xine_xmalloc(sizeof(post_plugin_volnorm_t));
+    post_plugin_volnorm_t *this  = calloc(1, sizeof(post_plugin_volnorm_t));
     post_in_t             *input;
     post_out_t            *output;
     xine_post_in_t        *input_api;
@@ -426,9 +426,8 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs,
     this->mul = MUL_INIT;
     this->lastavg = MID_S16;
     this->idx = 0;
-    for (i = 0; i < NSAMPLES; i++)
-        this->mem[i].len = this->mem[i].avg = 0;
-    
+    memset(this->mem, 0, sizeof(this->mem));
+
     port = _x_post_intercept_audio_port(&this->post, audio_target[0], &input, &output);
     port->new_port.open       = volnorm_port_open;
     port->new_port.close      = volnorm_port_close;