Browse code

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

Alex Beregszaszi authored on 2005/11/13 10:45:13
Showing 2 changed files
... ...
@@ -51,7 +51,9 @@ FileMaxSize 200K
51 51
 # This marks the file as readonly and it will not be deleted or updated.
52 52
 
53 53
 # Specify launch in order to start ffmpeg automatically.
54
-#Launch
54
+# First ffmpeg must be defined with an appropriate path if needed,
55
+# after that options can follow, but avoid adding the http:// field
56
+#Launch ffmpeg
55 57
 
56 58
 # Only allow connections from localhost to the feed.
57 59
 ACL allow 127.0.0.1
... ...
@@ -3852,10 +3852,7 @@ static int parse_ffconfig(const char *filename)
3852 3852
 
3853 3853
                 feed->child_argv = (char **) av_mallocz(64 * sizeof(char *));
3854 3854
 
3855
-                feed->child_argv[0] = av_malloc(7);
3856
-                strcpy(feed->child_argv[0], "ffmpeg");
3857
-
3858
-                for (i = 1; i < 62; i++) {
3855
+                for (i = 0; i < 62; i++) {
3859 3856
                     char argbuf[256];
3860 3857
 
3861 3858
                     get_arg(argbuf, sizeof(argbuf), &p);