1 files changed, 4 insertions, 23 deletions

diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 4419f8404..d3cf0ca3c 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -1038,11 +1038,6 @@ static int demux_mpeg_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_mpeg_dispose (demux_plugin_t *this_gen) {
-
-  free (this_gen);
-}
-
 static int demux_mpeg_get_stream_length (demux_plugin_t *this_gen) {
   demux_mpeg_t *this = (demux_mpeg_t *) this_gen;
 
@@ -1074,7 +1069,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_mpeg_send_headers;
   this->demux_plugin.send_chunk       = demux_mpeg_send_chunk;
   this->demux_plugin.seek              = demux_mpeg_seek;
-  this->demux_plugin.dispose           = demux_mpeg_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_mpeg_get_status;
   this->demux_plugin.get_stream_length = demux_mpeg_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_mpeg_get_capabilities;
@@ -1220,14 +1215,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "MPEG program stream demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mpg mpeg";
 }
@@ -1237,23 +1224,17 @@ static const char *get_mimetypes (demux_class_t *this_gen) {
          "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;";
 }
 
-static void class_dispose (demux_class_t *this_gen) {
-  demux_mpeg_class_t *this = (demux_mpeg_class_t *) this_gen;
-
-  free (this);
- }
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_mpeg_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_mpeg_class_t));
 
   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 program stream demux plugin");
+  this->demux_class.identifier      = "MPEG";
   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;
 }