mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-27 01:42:20 +00:00
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
This commit is contained in:
parent
2f5feea48b
commit
a7beab731d
3
configure
vendored
3
configure
vendored
@ -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));
|
||||
|
Loading…
Reference in New Issue
Block a user