3 files changed, 15 insertions, 18 deletions
diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index 5f3f8de97..4a7028b20 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -56,8 +56,8 @@ typedef struct post_plugin_deinterlace_s post_plugin_deinterlace_t;
 
 #define MAX_NUM_METHODS 30
 static const char *enum_methods[MAX_NUM_METHODS];
-static const char *enum_pulldown[] = { "none", "vektor", NULL };
-static const char *enum_framerate[] = { "full", "half_top", "half_bottom", NULL };
+static const char *const enum_pulldown[] = { "none", "vektor", NULL };
+static const char *const enum_framerate[] = { "full", "half_top", "half_bottom", NULL };
 
 static void *help_string;
 
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index 90ec331ee..efc3e49f8 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -318,8 +318,8 @@ typedef struct noise_parameters_s {
         type, quality, pattern;
 } noise_parameters_t;
 
-static char *enum_types[] = {"uniform", "gaussian", NULL};
-static char *enum_quality[] = {"fixed", "temporal", "averaged temporal", NULL};
+static const char *const enum_types[] = {"uniform", "gaussian", NULL};
+static const char *const enum_quality[] = {"fixed", "temporal", "averaged temporal", NULL};
 
 /*
  * description of params struct
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 484afdd31..f8c571dcb 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -20,6 +20,8 @@
  * plugin for ffmpeg libpostprocess
  */
 
+#include <config.h>
+
 #include <xine/xine_internal.h>
 #include <xine/post.h>
 #include <xine/xineutils.h>
@@ -102,23 +104,18 @@ static xine_post_api_descr_t * get_param_descr (void) {
 }
 
 static char * get_help (void) {
-  char *help1 = 
-         _("FFmpeg libpostprocess plugin.\n"
-           "\n"
-           "Parameters\n"
-           "\n");
-   
-  char *help2 =
-         _("\n"
-           "* libpostprocess (C) Michael Niedermayer\n"
-         );
   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);
+    asprintf(&help, "%s%s%s",
+	     _("FFmpeg libpostprocess plugin.\n"
+	       "\n"
+	       "Parameters\n"
+	       "\n"),
+	     pp_help,
+	     _("\n"
+	       "* libpostprocess (C) Michael Niedermayer\n")
+	     );
   }
   return help;
 }