From a7beab731d1579967de16ebdf33805189fbd087f Mon Sep 17 00:00:00 2001
From: Roman Shaposhnik <roman@shaposhnik.org>
Date: Fri, 11 Apr 2003 09:43:05 +0000
Subject: [PATCH] bunch of small thing patch by (Roman Shaposhnick <rvs at sun
dot com>)
Originally committed as revision 1753 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
configure | 3 +++
ffserver.c | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index acfc04f8eeb..9bacced277c 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 8b220b48f60..ceca3df824e 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));
--
GitLab