Merge from 1.2 branch.

1 files changed, 2 insertions, 9 deletions

diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 66af08e5c..225e75954 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -120,7 +120,6 @@ static xine_post_api_t post_api = {
 static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs,
 					 xine_audio_port_t **audio_target,
 					 xine_video_port_t **video_target);
-static void           boxblur_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
 static void           boxblur_dispose(post_plugin_t *this_gen);
@@ -134,7 +133,7 @@ static int            boxblur_draw(vo_frame_t *frame, xine_stream_t *stream);
 
 void *boxblur_init_plugin(xine_t *xine, void *data)
 {
-  post_class_t *class = (post_class_t *)malloc(sizeof(post_class_t));
+  post_class_t *class = (post_class_t *)xine_xmalloc(sizeof(post_class_t));
 
   if (!class)
     return NULL;
@@ -142,7 +141,7 @@ void *boxblur_init_plugin(xine_t *xine, void *data)
   class->open_plugin     = boxblur_open_plugin;
   class->identifier      = "boxblur";
   class->description     = N_("box blur filter from mplayer");
-  class->dispose         = boxblur_class_dispose;
+  class->dispose         = default_post_class_dispose;
 
   return class;
 }
@@ -192,12 +191,6 @@ static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static void boxblur_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
-
 static void boxblur_dispose(post_plugin_t *this_gen)
 {
   post_plugin_boxblur_t *this = (post_plugin_boxblur_t *)this_gen;