Merge file removal.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index 3053b2b68..99e2ba9d4 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.c
@@ -553,7 +553,7 @@ static audio_decoder_t *qta_open_plugin (audio_decoder_class_t *class_gen,
 
   qta_decoder_t *this ;
 
-  this = (qta_decoder_t *) xine_xmalloc (sizeof (qta_decoder_t));
+  this = (qta_decoder_t *) calloc(1, sizeof(qta_decoder_t));
 
   this->audio_decoder.decode_data         = qta_decode_data;
   this->audio_decoder.reset               = qta_reset;
@@ -592,7 +592,7 @@ static void *qta_init_class (xine_t *xine, void *data) {
 
   pthread_once (&once_control, init_routine);
 
-  this = (qta_class_t *) xine_xmalloc (sizeof (qta_class_t));
+  this = (qta_class_t *) calloc(1, sizeof(qta_class_t));
 
   this->decoder_class.open_plugin     = qta_open_plugin;
   this->decoder_class.get_identifier  = qta_get_identifier;
@@ -1063,7 +1063,7 @@ static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen,
   qtv_class_t   *cls = (qtv_class_t *) class_gen;
   qtv_decoder_t *this ;
 
-  this = (qtv_decoder_t *) xine_xmalloc (sizeof (qtv_decoder_t));
+  this = (qtv_decoder_t *) calloc(1, sizeof(qtv_decoder_t));
 
   this->video_decoder.decode_data         = qtv_decode_data;
   this->video_decoder.flush               = qtv_flush;
@@ -1116,7 +1116,7 @@ static void *qtv_init_class (xine_t *xine, void *data) {
 
   pthread_once (&once_control, init_routine);
 
-  this = (qtv_class_t *) xine_xmalloc (sizeof (qtv_class_t));
+  this = (qtv_class_t *) calloc(1, sizeof(qtv_class_t));
 
   this->decoder_class.open_plugin     = qtv_open_plugin;
   this->decoder_class.get_identifier  = qtv_get_identifier;
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 88790ebc7..64d29aeac 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -1550,7 +1550,7 @@ static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_
 
   w32v_decoder_t *this ;
 
-  this = (w32v_decoder_t *) xine_xmalloc (sizeof (w32v_decoder_t));
+  this = (w32v_decoder_t *) calloc(1, sizeof(w32v_decoder_t));
 
   this->video_decoder.decode_data         = w32v_decode_data;
   this->video_decoder.flush               = w32v_flush;
@@ -1593,7 +1593,7 @@ static void *init_video_decoder_class (xine_t *xine, void *data) {
   cfg = xine->config;
   if ((win32_def_path = get_win32_codecs_path(cfg)) == NULL) return NULL;
 
-  this = (w32v_class_t *) xine_xmalloc (sizeof (w32v_class_t));
+  this = (w32v_class_t *) calloc(1, sizeof(w32v_class_t));
 
   this->decoder_class.open_plugin     = open_video_decoder_plugin;
   this->decoder_class.get_identifier  = get_video_identifier;
@@ -1614,7 +1614,7 @@ static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_
 
   w32a_decoder_t *this ;
 
-  this = (w32a_decoder_t *) xine_xmalloc (sizeof (w32a_decoder_t));
+  this = (w32a_decoder_t *) calloc(1, sizeof(w32a_decoder_t));
 
   this->audio_decoder.decode_data         = w32a_decode_data;
   this->audio_decoder.reset               = w32a_reset;
@@ -1655,7 +1655,7 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) {
   cfg = xine->config;
   if ((win32_def_path = get_win32_codecs_path(cfg)) == NULL) return NULL;
 
-  this = (w32a_class_t *) xine_xmalloc (sizeof (w32a_class_t));
+  this = (w32a_class_t *) calloc(1, sizeof(w32a_class_t));
 
   this->decoder_class.open_plugin     = open_audio_decoder_plugin;
   this->decoder_class.get_identifier  = get_identifier;