virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Make Launch more appropriate with support for full paths for the ffmpeg binary

Browse Source 
Originally committed as revision 4693 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2005-11-13 01:45:13 +00:00
parent 4b4f38e42e
commit ac6a655b8a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ffserver.conf
View File

@ -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

5
ffserver.c
View File

@ -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);