2 files changed, 16 insertions, 26 deletions

diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index 8894b9d06..0ead54f55 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -442,26 +442,15 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs,
   
   _x_post_init(&this->post, 0, 1);
 
-  eq2 = &this->eq2;
-  for (i = 0; i < 3; i++) {
-    eq2->buf[i] = NULL;
-    eq2->buf_w[i] = 0;
-    eq2->buf_h[i] = 0;
-
-    eq2->param[i].adjust = NULL;
-    eq2->param[i].c = 1.0;
-    eq2->param[i].b = 0.0;
-    eq2->param[i].g = 1.0;
-    eq2->param[i].lut_clean = 0;
-  }
-
-  eq2->gamma = this->params.gamma = 1.0;
-  eq2->contrast = this->params.contrast = 1.0;
-  eq2->brightness = this->params.brightness = 0.0;
-  eq2->saturation = this->params.saturation = 1.0;
-  eq2->rgamma = this->params.rgamma = 1.0;
-  eq2->ggamma = this->params.ggamma = 1.0;
-  eq2->bgamma = this->params.bgamma = 1.0;
+  memset(&this->eq2, 0, sizeof(this->eq2));
+
+  this->eq2.gamma = this->params.gamma = 1.0;
+  this->eq2.contrast = this->params.contrast = 1.0;
+  this->eq2.brightness = this->params.brightness = 0.0;
+  this->eq2.saturation = this->params.saturation = 1.0;
+  this->eq2.rgamma = this->params.rgamma = 1.0;
+  this->eq2.ggamma = this->params.ggamma = 1.0;
+  this->eq2.bgamma = this->params.bgamma = 1.0;
 
   pthread_mutex_init(&this->lock, NULL);
   
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 3c6fe8767..51d28b33d 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -20,6 +20,10 @@
  * plugin for ffmpeg libpostprocess
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "xine_internal.h"
 #include "post.h"
 #include "xineutils.h"
@@ -119,12 +123,9 @@ static char * get_help (void) {
          );
   static char *help = NULL;
 
-  if( !help ) {
-    help = malloc( strlen(help1) + strlen(help2) + strlen(pp_help) + 1);
-    strcpy(help, help1);
-    strcat(help, pp_help);
-    strcat(help, help2);
-  }
+  if( !help )
+    asprintf(&help, "%s%s%s", help1, help2, pp_help);
+
   return help;
 }