From ac6a655b8a191a56dc194b548d8ba7bb16ea6abb Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sun, 13 Nov 2005 01:45:13 +0000
Subject: [PATCH] Make Launch more appropriate with support for full paths for
the ffmpeg binary
Originally committed as revision 4693 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
doc/ffserver.conf | 4 +++-
ffserver.c | 5 +----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index e7eee0d17c7..6ce7aae4fcf 100644
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -51,7 +51,9 @@ FileMaxSize 200K
# This marks the file as readonly and it will not be deleted or updated.
# Specify launch in order to start ffmpeg automatically.
-#Launch
+# First ffmpeg must be defined with an appropriate path if needed,
+# after that options can follow, but avoid adding the http:// field
+#Launch ffmpeg
# Only allow connections from localhost to the feed.
ACL allow 127.0.0.1
diff --git a/ffserver.c b/ffserver.c
index 9d34419c767..4bb95442f62 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3852,10 +3852,7 @@ static int parse_ffconfig(const char *filename)
feed->child_argv = (char **) av_mallocz(64 * sizeof(char *));
- feed->child_argv[0] = av_malloc(7);
- strcpy(feed->child_argv[0], "ffmpeg");
-
- for (i = 1; i < 62; i++) {
+ for (i = 0; i < 62; i++) {
char argbuf[256];
get_arg(argbuf, sizeof(argbuf), &p);
--
GitLab