Commit a7beab73 authored by Roman Shaposhnik's avatar Roman Shaposhnik Committed by Michael Niedermayer

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
parent 2f5feea4
......@@ -45,6 +45,9 @@ case "$cpu" in
mips)
cpu="mips"
;;
sun4u)
cpu="sparc64"
;;
*)
cpu="unknown"
;;
......
......@@ -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));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment