1 files changed, 4 insertions, 24 deletions

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 9c997c9f5..6728c2129 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -950,11 +950,6 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_mpgaudio_dispose (demux_plugin_t *this) {
-
-  free (this);
-}
-
 static int demux_mpgaudio_get_stream_length (demux_plugin_t *this_gen) {
   demux_mpgaudio_t *this = (demux_mpgaudio_t *) this_gen;
 
@@ -1012,7 +1007,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_mpgaudio_send_headers;
   this->demux_plugin.send_chunk        = demux_mpgaudio_send_chunk;
   this->demux_plugin.seek              = demux_mpgaudio_seek;
-  this->demux_plugin.dispose           = demux_mpgaudio_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_mpgaudio_get_status;
   this->demux_plugin.get_stream_length = demux_mpgaudio_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_mpgaudio_get_capabilities;
@@ -1031,14 +1026,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
  * demux mpegaudio class
  */
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "MPEG audio demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEGAUDIO";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen;
   
@@ -1066,13 +1053,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) {
     return "";
 }
 
-static void class_dispose (demux_class_t *this_gen) {
-
-  demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
   
   demux_mpgaudio_class_t     *this;
@@ -1081,11 +1061,11 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = N_("MPEG audio demux plugin");
+  this->demux_class.identifier      = "MPEGAUDIO";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
-  this->demux_class.dispose         = class_dispose;
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }