[Ffmpeg-cvslog] CVS: ffmpeg/doc ffserver.conf,1.23,1.24

Alex Beregszaszi alex
Sun Nov 13 02:45:16 CET 2005

Update of /cvsroot/ffmpeg/ffmpeg/doc
In directory mail:/var2/tmp/cvs-serv4404/doc

Modified Files:
Log Message:
Make Launch more appropriate with support for full paths for the ffmpeg binary

Index: ffserver.conf
RCS file: /cvsroot/ffmpeg/ffmpeg/doc/ffserver.conf,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ffserver.conf	13 Nov 2005 01:30:20 -0000	1.23
+++ ffserver.conf	13 Nov 2005 01:45:13 -0000	1.24
@@ -51,7 +51,9 @@
 # This marks the file as readonly and it will not be deleted or updated.
 # Specify launch in order to start ffmpeg automatically.
+# 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

More information about the ffmpeg-cvslog mailing list