Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2005-11-13 04:45:13 +0300
committerAlex Beregszaszi <alex@rtfs.hu>2005-11-13 04:45:13 +0300
commitac6a655b8a191a56dc194b548d8ba7bb16ea6abb (patch)
tree9dadc29db51a4f44032378bb6418de667162f223 /doc/ffserver.conf
parent4b4f38e42e7b390f3e7f0489da746dbbc9f6bbba (diff)
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
Diffstat (limited to 'doc/ffserver.conf')
-rw-r--r--doc/ffserver.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index e7eee0d17c..6ce7aae4fc 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