1 files changed, 11 insertions, 11 deletions

diff --git a/src/combined/demux_wavpack.c b/src/combined/demux_wavpack.c
index e8081bca9..94a23acdc 100644
--- a/src/combined/demux_wavpack.c
+++ b/src/combined/demux_wavpack.c
@@ -39,7 +39,7 @@
 
 typedef struct {
   demux_plugin_t demux_plugin;
-  
+
   xine_stream_t *stream;
   fifo_buffer_t *audio_fifo;
   input_plugin_t *input;
@@ -188,7 +188,7 @@ static int demux_wv_send_chunk(demux_plugin_t *const this_gen) {
     this->status = DEMUX_FINISHED;
     return this->status;
   }
-  
+
   lprintf("current sample: %u\n", this->current_sample);
 
   do {
@@ -229,7 +229,7 @@ static int demux_wv_send_chunk(demux_plugin_t *const this_gen) {
       input_time_guess *= buf->extra_info->input_normpos;
       input_time_guess /= 65535;
       buf->extra_info->input_time = input_time_guess;
-      
+
       if ( ! header_sent )
 	offset = sizeof(wvheader_t);
 
@@ -247,7 +247,7 @@ static int demux_wv_send_chunk(demux_plugin_t *const this_gen) {
 
       if ( bytes_to_read <= 0 && (le2me_32(header.flags) & FINAL_BLOCK) == FINAL_BLOCK)
 	buf->decoder_flags |= BUF_FLAG_FRAME_END;
-    
+
       this->audio_fifo->put(this->audio_fifo, buf);
     }
   } while ( (le2me_32(header.flags) & FINAL_BLOCK) != FINAL_BLOCK );
@@ -271,7 +271,7 @@ static void demux_wv_send_headers(demux_plugin_t *const this_gen) {
   /* Send header to decoder */
   if (this->audio_fifo) {
     buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo);
-    
+
     buf->type            = BUF_AUDIO_WAVPACK;
     buf->decoder_flags   = BUF_FLAG_HEADER|BUF_FLAG_STDHEADER|BUF_FLAG_FRAME_END;
     buf->decoder_info[0] = this->input->get_length(this->input);
@@ -332,7 +332,7 @@ static int demux_wv_get_optional_data(demux_plugin_t *const this_gen,
 static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
 				    xine_stream_t *const stream,
 				    input_plugin_t *const input) {
-  demux_wv_t *const this = xine_xmalloc (sizeof (demux_wv_t));
+  demux_wv_t *const this = calloc(1, sizeof (demux_wv_t));
   this->stream = stream;
   this->input = input;
 
@@ -362,12 +362,12 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
 
   case METHOD_BY_CONTENT:
   case METHOD_EXPLICIT:
-    
+
     if (!open_wv_file(this)) {
       free (this);
       return NULL;
     }
-  
+
   break;
 
   default:
@@ -387,11 +387,11 @@ static const char *get_identifier (demux_class_t *const this_gen) {
 }
 
 static const char *get_extensions (demux_class_t *const this_gen) {
-  return "wv";
+  return "wv wvp";
 }
 
 static const char *get_mimetypes (demux_class_t *const this_gen) {
-  return NULL;
+  return "audio/x-wavpack: wv,wvp: WavPack audio;";
 }
 
 static void class_dispose (demux_class_t *const this_gen) {
@@ -401,7 +401,7 @@ static void class_dispose (demux_class_t *const this_gen) {
 }
 
 void *demux_wv_init_plugin (xine_t *const xine, void *const data) {
-  demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t));
+  demux_wv_class_t *const this = calloc(1, sizeof (demux_wv_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.get_description = get_description;