2 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index acfc04f8ee..9bacced277 100755
--- a/configure
+++ b/configure
@@ -45,6 +45,9 @@ case "$cpu" in
   mips)
     cpu="mips"
   ;;
+  sun4u)
+    cpu="sparc64"
+  ;;
   *)
     cpu="unknown"
   ;;
diff --git a/ffserver.c b/ffserver.c
index 8b220b48f6..ceca3df824 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3823,8 +3823,11 @@ static int parse_ffconfig(const char *filename)
                     if (!argbuf[0])
                         break;
 
-                    feed->child_argv[i] = av_malloc(strlen(argbuf + 1));
-                    strcpy(feed->child_argv[i], argbuf);
+                    if (strlen(argbuf + 1)) {
+		        feed->child_argv[i] = av_malloc(strlen(argbuf + 1));
+                        strcpy(feed->child_argv[i], argbuf);
+		    } else
+		        feed->child_argv[i] = NULL;
                 }
 
                 feed->child_argv[i] = av_malloc(30 + strlen(feed->filename));