Browse Source

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
tags/v0.5
Roman Shaposhnik Michael Niedermayer 22 years ago
parent
commit
a7beab731d
2 changed files with 8 additions and 2 deletions
  1. +3
    -0
      configure
  2. +5
    -2
      ffserver.c

+ 3
- 0
configure View File

@@ -45,6 +45,9 @@ case "$cpu" in
mips)
cpu="mips"
;;
sun4u)
cpu="sparc64"
;;
*)
cpu="unknown"
;;


+ 5
- 2
ffserver.c View File

@@ -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…
Cancel
Save