1 files changed, 4 insertions, 24 deletions

diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 2d21f080d..d41bef207 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -320,12 +320,6 @@ static int demux_raw_dv_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_raw_dv_dispose (demux_plugin_t *this_gen) {
-  demux_raw_dv_t *this = (demux_raw_dv_t *) this_gen;
-
-  free (this);
-}
-
 static int demux_raw_dv_get_stream_length(demux_plugin_t *this_gen) {
   demux_raw_dv_t *this = (demux_raw_dv_t *) this_gen;
 
@@ -354,7 +348,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_raw_dv_send_headers;
   this->demux_plugin.send_chunk        = demux_raw_dv_send_chunk;
   this->demux_plugin.seek              = demux_raw_dv_seek;
-  this->demux_plugin.dispose           = demux_raw_dv_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_raw_dv_get_status;
   this->demux_plugin.get_stream_length = demux_raw_dv_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_raw_dv_get_capabilities;
@@ -411,14 +405,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 "Raw DV Video stream";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "raw_dv";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "dv dif";
 }
@@ -427,23 +413,17 @@ static const char *get_mimetypes (demux_class_t *this_gen) {
   return NULL;
 }
 
-static void class_dispose (demux_class_t *this_gen) {
-  demux_raw_dv_class_t *this = (demux_raw_dv_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_raw_dv_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_raw_dv_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_("Raw DV Video stream");
+  this->demux_class.identifier      = "raw_dv";
   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;
 }