Add a default_demux_plugin_dispose macro, and use it when the plugin dispose macro just calls free().

33 files changed, 34 insertions, 213 deletions

diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index 9416b43c3..50c8e0985 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.h
@@ -180,6 +180,8 @@ struct demux_plugin_s {
 
 } ;
 
+#define default_demux_plugin_dispose (void (*) (demux_plugin_t *this))free
+
 /*
  * possible capabilites a demux plugin can have:
  */
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index 8df2dec02..3c28c1ad5 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -439,12 +439,6 @@ static int demux_fourxm_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_fourxm_dispose (demux_plugin_t *this_gen) {
-  demux_fourxm_t *this = (demux_fourxm_t *) this_gen;
-
-  free(this->tracks);
-}
-
 static int demux_fourxm_get_status (demux_plugin_t *this_gen) {
   demux_fourxm_t *this = (demux_fourxm_t *) this_gen;
 
@@ -479,7 +473,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_fourxm_send_headers;
   this->demux_plugin.send_chunk        = demux_fourxm_send_chunk;
   this->demux_plugin.seek              = demux_fourxm_seek;
-  this->demux_plugin.dispose           = demux_fourxm_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_fourxm_get_status;
   this->demux_plugin.get_stream_length = demux_fourxm_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_fourxm_get_capabilities;
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index 415521852..64f94b46a 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -230,12 +230,6 @@ static int demux_aac_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_aac_dispose (demux_plugin_t *this_gen) {
-  demux_aac_t *this = (demux_aac_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_aac_get_status (demux_plugin_t *this_gen) {
   demux_aac_t *this = (demux_aac_t *) this_gen;
 
@@ -269,7 +263,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_aac_send_headers;
   this->demux_plugin.send_chunk        = demux_aac_send_chunk;
   this->demux_plugin.seek              = demux_aac_seek;
-  this->demux_plugin.dispose           = demux_aac_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_aac_get_status;
   this->demux_plugin.get_stream_length = demux_aac_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_aac_get_capabilities;
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index d3a938909..3f5b7a6aa 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -384,12 +384,6 @@ static int demux_ac3_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_ac3_dispose (demux_plugin_t *this_gen) {
-  demux_ac3_t *this = (demux_ac3_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_ac3_get_status (demux_plugin_t *this_gen) {
   demux_ac3_t *this = (demux_ac3_t *) this_gen;
 
@@ -424,7 +418,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_ac3_send_headers;
   this->demux_plugin.send_chunk        = demux_ac3_send_chunk;
   this->demux_plugin.seek              = demux_ac3_seek;
-  this->demux_plugin.dispose           = demux_ac3_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_ac3_get_status;
   this->demux_plugin.get_stream_length = demux_ac3_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_ac3_get_capabilities;
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index 4cb693c39..c7b98d8ac 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -304,12 +304,6 @@ static int demux_aiff_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_aiff_dispose (demux_plugin_t *this_gen) {
-  demux_aiff_t *this = (demux_aiff_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_aiff_get_status (demux_plugin_t *this_gen) {
   demux_aiff_t *this = (demux_aiff_t *) this_gen;
 
@@ -344,7 +338,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_aiff_send_headers;
   this->demux_plugin.send_chunk        = demux_aiff_send_chunk;
   this->demux_plugin.seek              = demux_aiff_seek;
-  this->demux_plugin.dispose           = demux_aiff_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_aiff_get_status;
   this->demux_plugin.get_stream_length = demux_aiff_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_aiff_get_capabilities;
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index 6b72d44eb..35df1856c 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -241,11 +241,6 @@ static int demux_aud_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_aud_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_aud_get_status (demux_plugin_t *this_gen) {
   demux_aud_t *this = (demux_aud_t *) this_gen;
 
@@ -277,7 +272,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_aud_send_headers;
   this->demux_plugin.send_chunk        = demux_aud_send_chunk;
   this->demux_plugin.seek              = demux_aud_seek;
-  this->demux_plugin.dispose           = demux_aud_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_aud_get_status;
   this->demux_plugin.get_stream_length = demux_aud_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_aud_get_capabilities;
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index a8e59796a..181e6a034 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -153,12 +153,6 @@ static int demux_cdda_seek (demux_plugin_t *this_gen, off_t start_pos, int start
   return this->status;
 }
 
-static void demux_cdda_dispose (demux_plugin_t *this_gen) {
-  demux_cdda_t *this = (demux_cdda_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_cdda_get_status (demux_plugin_t *this_gen) {
   demux_cdda_t *this = (demux_cdda_t *) this_gen;
 
@@ -194,7 +188,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_cdda_send_headers;
   this->demux_plugin.send_chunk        = demux_cdda_send_chunk;
   this->demux_plugin.seek              = demux_cdda_seek;
-  this->demux_plugin.dispose           = demux_cdda_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_cdda_get_status;
   this->demux_plugin.get_stream_length = demux_cdda_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_cdda_get_capabilities;
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
index c64b7dc17..998106a0d 100644
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -320,12 +320,6 @@ static int demux_dts_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_dts_dispose (demux_plugin_t *this_gen) {
-  demux_dts_t *this = (demux_dts_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_dts_get_status (demux_plugin_t *this_gen) {
   demux_dts_t *this = (demux_dts_t *) this_gen;
 
@@ -353,7 +347,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_dts_send_headers;
   this->demux_plugin.send_chunk        = demux_dts_send_chunk;
   this->demux_plugin.seek              = demux_dts_seek;
-  this->demux_plugin.dispose           = demux_dts_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_dts_get_status;
   this->demux_plugin.get_stream_length = demux_dts_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_dts_get_capabilities;
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index 49086678d..bcaaf8543 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -322,10 +322,6 @@ static int demux_eawve_seek(demux_eawve_t *this, off_t start_pos, int start_time
   return this->status;
 }
 
-static void demux_eawve_dispose(demux_eawve_t *this){
-  free(this);
-}
-
 static int demux_eawve_get_status(demux_eawve_t *this){
   return this->status;
 }
@@ -356,7 +352,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
   this->demux_plugin.send_headers      = (void*)demux_eawve_send_headers;
   this->demux_plugin.send_chunk        = (void*)demux_eawve_send_chunk;
   this->demux_plugin.seek              = (void*)demux_eawve_seek;
-  this->demux_plugin.dispose           = (void*)demux_eawve_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = (void*)demux_eawve_get_status;
   this->demux_plugin.get_stream_length = (void*)demux_eawve_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_eawve_get_capabilities;
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 2cf50dcc2..230242083 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -169,11 +169,6 @@ static int demux_mpeg_elem_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_mpeg_elem_dispose (demux_plugin_t *this) {
-
-  free (this);
-}
-
 static int demux_mpeg_elem_get_stream_length(demux_plugin_t *this_gen) {
   return 0 ; /*FIXME: implement */
 }
@@ -247,7 +242,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_mpeg_elem_send_headers;
   this->demux_plugin.send_chunk        = demux_mpeg_elem_send_chunk;
   this->demux_plugin.seek              = demux_mpeg_elem_seek;
-  this->demux_plugin.dispose           = demux_mpeg_elem_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_mpeg_elem_get_status;
   this->demux_plugin.get_stream_length = demux_mpeg_elem_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_mpeg_elem_get_capabilities;
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index accfbcb4e..80b41bef5 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -439,12 +439,6 @@ static int demux_flac_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_flac_dispose (demux_plugin_t *this_gen) {
-  demux_flac_t *this = (demux_flac_t *) this_gen;
-
-  free(this->seekpoints);
-}
-
 static int demux_flac_get_status (demux_plugin_t *this_gen) {
   demux_flac_t *this = (demux_flac_t *) this_gen;
 
@@ -488,7 +482,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_flac_send_headers;
   this->demux_plugin.send_chunk        = demux_flac_send_chunk;
   this->demux_plugin.seek              = demux_flac_seek;
-  this->demux_plugin.dispose           = demux_flac_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_flac_get_status;
   this->demux_plugin.get_stream_length = demux_flac_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_flac_get_capabilities;
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index c56d55e75..1f59c340b 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -266,11 +266,6 @@ static int demux_fli_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_fli_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_fli_get_status (demux_plugin_t *this_gen) {
   demux_fli_t *this = (demux_fli_t *) this_gen;
 
@@ -310,7 +305,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_fli_send_headers;
   this->demux_plugin.send_chunk        = demux_fli_send_chunk;
   this->demux_plugin.seek              = demux_fli_seek;
-  this->demux_plugin.dispose           = demux_fli_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_fli_get_status;
   this->demux_plugin.get_stream_length = demux_fli_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_fli_get_capabilities;
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 76d460476..cef8f48dc 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -444,11 +444,6 @@ static int demux_idcin_seek (demux_plugin_t *this_gen, off_t start_pos, int star
   return this->status;
 }
 
-static void demux_idcin_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_idcin_get_status (demux_plugin_t *this_gen) {
   demux_idcin_t *this = (demux_idcin_t *) this_gen;
 
@@ -480,7 +475,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_idcin_send_headers;
   this->demux_plugin.send_chunk        = demux_idcin_send_chunk;
   this->demux_plugin.seek              = demux_idcin_seek;
-  this->demux_plugin.dispose           = demux_idcin_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_idcin_get_status;
   this->demux_plugin.get_stream_length = demux_idcin_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_idcin_get_capabilities;
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index 2a1e56230..c3352d7c8 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -143,13 +143,6 @@ static int demux_image_get_optional_data(demux_plugin_t *this_gen,
   return DEMUX_OPTIONAL_UNSUPPORTED;
 }
 
-static void demux_image_dispose (demux_plugin_t *this_gen) {
-  demux_image_t *this = (demux_image_t *) this_gen;
-
-  lprintf("closed\n");
-  free (this);
-}
-
 static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 				    xine_stream_t *stream,
 				    input_plugin_t *input) {
@@ -205,7 +198,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   this->demux_plugin.send_headers      = demux_image_send_headers;
   this->demux_plugin.send_chunk        = demux_image_send_chunk;
   this->demux_plugin.seek              = demux_image_seek;
-  this->demux_plugin.dispose           = demux_image_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_image_get_status;
   this->demux_plugin.get_stream_length = demux_image_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_image_get_capabilities;
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index 2192ccf45..7c2918bb2 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -292,12 +292,6 @@ static int demux_mpc_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_mpc_dispose (demux_plugin_t *this_gen) {
-  demux_mpc_t *this = (demux_mpc_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_mpc_get_status (demux_plugin_t *this_gen) {
   demux_mpc_t *this = (demux_mpc_t *) this_gen;
 
@@ -331,7 +325,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_mpc_send_headers;
   this->demux_plugin.send_chunk        = demux_mpc_send_chunk;
   this->demux_plugin.seek              = demux_mpc_seek;
-  this->demux_plugin.dispose           = demux_mpc_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_mpc_get_status;
   this->demux_plugin.get_stream_length = demux_mpc_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_mpc_get_capabilities;
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 48bf31737..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;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index bbb95e893..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;
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index ee87a2f34..7ece813a0 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -565,11 +565,6 @@ static int demux_nsv_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_nsv_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_nsv_get_status (demux_plugin_t *this_gen) {
   demux_nsv_t *this = (demux_nsv_t *) this_gen;
 
@@ -601,7 +596,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_nsv_send_headers;
   this->demux_plugin.send_chunk        = demux_nsv_send_chunk;
   this->demux_plugin.seek              = demux_nsv_seek;
-  this->demux_plugin.dispose           = demux_nsv_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_nsv_get_status;
   this->demux_plugin.get_stream_length = demux_nsv_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_nsv_get_capabilities;
diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c
index d9402479d..da90dbbcc 100644
--- a/src/demuxers/demux_playlist.c
+++ b/src/demuxers/demux_playlist.c
@@ -611,12 +611,6 @@ static int demux_playlist_seek (demux_plugin_t *this_gen,
   return DEMUX_OK;
 }
 
-static void demux_playlist_dispose (demux_plugin_t *this_gen) {
-  demux_playlist_t *this = (demux_playlist_t *) this_gen;
-  
-  free (this);
-}
-
 static int demux_playlist_get_status (demux_plugin_t *this_gen) {
   demux_playlist_t *this = (demux_playlist_t *) this_gen;
   
@@ -649,7 +643,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   this->demux_plugin.send_headers      = demux_playlist_send_headers;
   this->demux_plugin.send_chunk        = demux_playlist_send_chunk;
   this->demux_plugin.seek              = demux_playlist_seek;
-  this->demux_plugin.dispose           = demux_playlist_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_playlist_get_status;
   this->demux_plugin.get_stream_length = demux_playlist_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_playlist_get_capabilities;
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 027029885..d936f5ef1 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -396,11 +396,6 @@ static int demux_pva_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_pva_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_pva_get_status (demux_plugin_t *this_gen) {
   demux_pva_t *this = (demux_pva_t *) this_gen;
 
@@ -437,7 +432,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_pva_send_headers;
   this->demux_plugin.send_chunk        = demux_pva_send_chunk;
   this->demux_plugin.seek              = demux_pva_seek;
-  this->demux_plugin.dispose           = demux_pva_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_pva_get_status;
   this->demux_plugin.get_stream_length = demux_pva_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_pva_get_capabilities;
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 067f88d1c..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;
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 146995ae9..50ff61553 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -377,11 +377,6 @@ static int demux_roq_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_roq_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_roq_get_status (demux_plugin_t *this_gen) {
   demux_roq_t *this = (demux_roq_t *) this_gen;
 
@@ -418,7 +413,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_roq_send_headers;
   this->demux_plugin.send_chunk        = demux_roq_send_chunk;
   this->demux_plugin.seek              = demux_roq_seek;
-  this->demux_plugin.dispose           = demux_roq_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_roq_get_status;
   this->demux_plugin.get_stream_length = demux_roq_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_roq_get_capabilities;
diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c
index 3654cc074..e16a58604 100644
--- a/src/demuxers/demux_shn.c
+++ b/src/demuxers/demux_shn.c
@@ -150,12 +150,6 @@ static int demux_shn_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_shn_dispose (demux_plugin_t *this_gen) {
-  demux_shn_t *this = (demux_shn_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_shn_get_status (demux_plugin_t *this_gen) {
   demux_shn_t *this = (demux_shn_t *) this_gen;
 
@@ -189,7 +183,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_shn_send_headers;
   this->demux_plugin.send_chunk        = demux_shn_send_chunk;
   this->demux_plugin.seek              = demux_shn_seek;
-  this->demux_plugin.dispose           = demux_shn_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_shn_get_status;
   this->demux_plugin.get_stream_length = demux_shn_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_shn_get_capabilities;
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 8c3b4663f..0c9094ac1 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -362,12 +362,6 @@ static int demux_smjpeg_seek (demux_plugin_t *this_gen, off_t start_pos, int sta
 }
 
 
-static void demux_smjpeg_dispose (demux_plugin_t *this_gen) {
-  demux_smjpeg_t *this = (demux_smjpeg_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_smjpeg_get_status (demux_plugin_t *this_gen) {
   demux_smjpeg_t *this = (demux_smjpeg_t *) this_gen;
 
@@ -407,7 +401,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_smjpeg_send_headers;
   this->demux_plugin.send_chunk        = demux_smjpeg_send_chunk;
   this->demux_plugin.seek              = demux_smjpeg_seek;
-  this->demux_plugin.dispose           = demux_smjpeg_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_smjpeg_get_status;
   this->demux_plugin.get_stream_length = demux_smjpeg_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_smjpeg_get_capabilities;
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index f3d7458f8..42c192d78 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -285,12 +285,6 @@ static int demux_snd_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_snd_dispose (demux_plugin_t *this_gen) {
-  demux_snd_t *this = (demux_snd_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_snd_get_status (demux_plugin_t *this_gen) {
   demux_snd_t *this = (demux_snd_t *) this_gen;
 
@@ -325,7 +319,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_snd_send_headers;
   this->demux_plugin.send_chunk        = demux_snd_send_chunk;
   this->demux_plugin.seek              = demux_snd_seek;
-  this->demux_plugin.dispose           = demux_snd_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_snd_get_status;
   this->demux_plugin.get_stream_length = demux_snd_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_snd_get_capabilities;
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index b878be2e8..6ce23325d 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -518,11 +518,6 @@ static int demux_str_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_str_dispose (demux_plugin_t *this) {
-
-  free(this);
-}
-
 static int demux_str_get_status (demux_plugin_t *this_gen) {
   demux_str_t *this = (demux_str_t *) this_gen;
 
@@ -562,7 +557,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_str_send_headers;
   this->demux_plugin.send_chunk        = demux_str_send_chunk;
   this->demux_plugin.seek              = demux_str_seek;
-  this->demux_plugin.dispose           = demux_str_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_str_get_status;
   this->demux_plugin.get_stream_length = demux_str_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_str_get_capabilities;
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index 294ed81c8..a150bc533 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -200,12 +200,6 @@ static int demux_tta_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_tta_dispose (demux_plugin_t *this_gen) {
-  demux_tta_t *this = (demux_tta_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_tta_get_status (demux_plugin_t *this_gen) {
   demux_tta_t *this = (demux_tta_t *) this_gen;
 
@@ -239,7 +233,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_tta_send_headers;
   this->demux_plugin.send_chunk        = demux_tta_send_chunk;
   this->demux_plugin.seek              = demux_tta_seek;
-  this->demux_plugin.dispose           = demux_tta_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_tta_get_status;
   this->demux_plugin.get_stream_length = demux_tta_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_tta_get_capabilities;
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
index 1f17ede1f..65a41d0d3 100644
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -389,12 +389,6 @@ static int demux_vmd_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_vmd_dispose (demux_plugin_t *this_gen) {
-  demux_vmd_t *this = (demux_vmd_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_vmd_get_status (demux_plugin_t *this_gen) {
   demux_vmd_t *this = (demux_vmd_t *) this_gen;
 
@@ -428,7 +422,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_vmd_send_headers;
   this->demux_plugin.send_chunk        = demux_vmd_send_chunk;
   this->demux_plugin.seek              = demux_vmd_seek;
-  this->demux_plugin.dispose           = demux_vmd_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_vmd_get_status;
   this->demux_plugin.get_stream_length = demux_vmd_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_vmd_get_capabilities;
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 7ab909c2d..99c5a5cc5 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -263,12 +263,6 @@ static int demux_voc_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_voc_dispose (demux_plugin_t *this_gen) {
-  demux_voc_t *this = (demux_voc_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_voc_get_status (demux_plugin_t *this_gen) {
   demux_voc_t *this = (demux_voc_t *) this_gen;
 
@@ -303,7 +297,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_voc_send_headers;
   this->demux_plugin.send_chunk        = demux_voc_send_chunk;
   this->demux_plugin.seek              = demux_voc_seek;
-  this->demux_plugin.dispose           = demux_voc_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_voc_get_status;
   this->demux_plugin.get_stream_length = demux_voc_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_voc_get_capabilities;
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
index 32fe83373..8d5f9e174 100644
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -150,12 +150,6 @@ static int demux_vox_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_vox_dispose (demux_plugin_t *this_gen) {
-  demux_vox_t *this = (demux_vox_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_vox_get_status (demux_plugin_t *this_gen) {
   demux_vox_t *this = (demux_vox_t *) this_gen;
 
@@ -210,7 +204,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_vox_send_headers;
   this->demux_plugin.send_chunk        = demux_vox_send_chunk;
   this->demux_plugin.seek              = demux_vox_seek;
-  this->demux_plugin.dispose           = demux_vox_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_vox_get_status;
   this->demux_plugin.get_stream_length = demux_vox_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_vox_get_capabilities;
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 3dbe058da..e3d78f88d 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -304,12 +304,6 @@ static int demux_vqa_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_vqa_dispose (demux_plugin_t *this_gen) {
-  demux_vqa_t *this = (demux_vqa_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_vqa_get_status (demux_plugin_t *this_gen) {
   demux_vqa_t *this = (demux_vqa_t *) this_gen;
 
@@ -341,7 +335,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_vqa_send_headers;
   this->demux_plugin.send_chunk        = demux_vqa_send_chunk;
   this->demux_plugin.seek              = demux_vqa_seek;
-  this->demux_plugin.dispose           = demux_vqa_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_vqa_get_status;
   this->demux_plugin.get_stream_length = demux_vqa_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_vqa_get_capabilities;
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index eaed4c274..33e7f8a56 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -370,12 +370,6 @@ static int demux_yuv4mpeg2_seek (demux_plugin_t *this_gen,
   return this->status;
 }
 
-static void demux_yuv4mpeg2_dispose (demux_plugin_t *this_gen) {
-  demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_yuv4mpeg2_get_status (demux_plugin_t *this_gen) {
   demux_yuv4mpeg2_t *this = (demux_yuv4mpeg2_t *) this_gen;
 
@@ -410,7 +404,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_yuv4mpeg2_send_headers;
   this->demux_plugin.send_chunk        = demux_yuv4mpeg2_send_chunk;
   this->demux_plugin.seek              = demux_yuv4mpeg2_seek;
-  this->demux_plugin.dispose           = demux_yuv4mpeg2_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_yuv4mpeg2_get_status;
   this->demux_plugin.get_stream_length = demux_yuv4mpeg2_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_yuv4mpeg2_get_capabilities;
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 71915cb9a..1ffdc39d5 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -164,12 +164,6 @@ static int demux_yuv_frames_get_optional_data(demux_plugin_t *this_gen,
   return DEMUX_OPTIONAL_UNSUPPORTED;
 }
 
-static void demux_yuv_frames_dispose (demux_plugin_t *this_gen) {
-  demux_yuv_frames_t *this = (demux_yuv_frames_t *) this_gen;
-
-  free (this);
-}
-
 static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 				    xine_stream_t *stream,
 				    input_plugin_t *input) {
@@ -210,7 +204,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   this->demux_plugin.send_headers      = demux_yuv_frames_send_headers;
   this->demux_plugin.send_chunk        = demux_yuv_frames_send_chunk;
   this->demux_plugin.seek              = demux_yuv_frames_seek;
-  this->demux_plugin.dispose           = demux_yuv_frames_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_yuv_frames_get_status;
   this->demux_plugin.get_stream_length = demux_yuv_frames_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_yuv_frames_get_capabilities;