Commit c9a9f96d authored by michaelni's avatar michaelni

bunch of small thing patch by (Roman Shaposhnick <rvs at sun dot com>)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1753 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 20eb9d97
...@@ -45,6 +45,9 @@ case "$cpu" in ...@@ -45,6 +45,9 @@ case "$cpu" in
mips) mips)
cpu="mips" cpu="mips"
;; ;;
sun4u)
cpu="sparc64"
;;
*) *)
cpu="unknown" cpu="unknown"
;; ;;
......
...@@ -3823,8 +3823,11 @@ static int parse_ffconfig(const char *filename) ...@@ -3823,8 +3823,11 @@ static int parse_ffconfig(const char *filename)
if (!argbuf[0]) if (!argbuf[0])
break; break;
if (strlen(argbuf + 1)) {
feed->child_argv[i] = av_malloc(strlen(argbuf + 1)); feed->child_argv[i] = av_malloc(strlen(argbuf + 1));
strcpy(feed->child_argv[i], argbuf); strcpy(feed->child_argv[i], argbuf);
} else
feed->child_argv[i] = NULL;
} }
feed->child_argv[i] = av_malloc(30 + strlen(feed->filename)); 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