Merge file removal.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index c7af1c508..a32063515 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -341,7 +341,7 @@ static xing_header_t* parse_xing_header(mpg_audio_frame_t *frame,
     int has_frames_flag = 0;
     int has_bytes_flag = 0;
   
-    xing = xine_xmalloc (sizeof (xing_header_t));
+    xing = calloc(1, sizeof(xing_header_t));
     if (!xing)
       goto exit_error;
   
@@ -427,7 +427,7 @@ static vbri_header_t* parse_vbri_header(mpg_audio_frame_t *frame,
   uint8_t *ptr = buf;
   vbri_header_t *vbri;
 
-  vbri = xine_xmalloc (sizeof (vbri_header_t));
+  vbri = calloc(1, sizeof(vbri_header_t));
   if (!vbri)
     return NULL;
 
@@ -1148,7 +1148,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     return NULL;
   }
 
-  this = xine_xmalloc (sizeof (demux_mpgaudio_t));
+  this = calloc(1, sizeof(demux_mpgaudio_t));
 
   this->demux_plugin.send_headers      = demux_mpgaudio_send_headers;
   this->demux_plugin.send_chunk        = demux_mpgaudio_send_chunk;
@@ -1223,7 +1223,7 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
   
   demux_mpgaudio_class_t     *this;
   
-  this         = xine_xmalloc (sizeof (demux_mpgaudio_class_t));
+  this         = calloc(1, sizeof(demux_mpgaudio_class_t));
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;