X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=doc%2Fffserver.conf;h=a3b3ff4129dac60ada6c5e4d603e28edf962349b;hb=3c88ea24761efda7d1c7886119c618e1f66cb1c9;hp=c6720908f886aef5eb438b67338e277abe168f47;hpb=a2632fd268b383936b86940346fc42e35d960bbd;p=ffmpeg

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index c6720908f88..a3b3ff4129d 100644
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -34,14 +34,14 @@ NoDaemon
 
 # You must use 'ffmpeg' to send a live feed to ffserver. In this
 # example, you can type:
-# 
+#
 # ffmpeg http://localhost:8090/feed1.ffm
 
 # ffserver can also do time shifting. It means that it can stream any
 # previously recorded live stream. The request should contain:
 # "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify
 # a path where the feed is stored on disk. You also specify the
-# maximum size of the feed (100M bytes here). Default:
+# maximum size of the feed, where zero means unlimited. Default:
 # File=/tmp/feed_name.ffm FileMaxSize=5M
 File /tmp/feed1.ffm
 FileMaxSize 200K
@@ -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
@@ -81,12 +83,12 @@ Feed feed1.ffm
 # jpeg       : Generate a single JPEG image.
 # asf        : ASF compatible streaming (Windows Media Player format).
 # swf        : Macromedia Flash compatible stream
-# avi        : AVI format (OpenDivX video, MPEG audio sound)
+# avi        : AVI format (MPEG-4 video, MPEG audio sound)
 # master     : special ffmpeg stream used to duplicate a server
 Format mpeg
 
 # Bitrate for the audio stream. Codecs usually support only a few
-# different bitrates. 
+# different bitrates.
 AudioBitRate 32
 
 # Number of audio channels: 1 = mono, 2 = stereo
@@ -121,7 +123,7 @@ VideoGopSize 12
 # VideoHighQuality
 # Video4MotionVector
 
-# Choose your codecs: 
+# Choose your codecs:
 #AudioCodec mp2
 #VideoCodec mpeg1video
 
@@ -151,7 +153,7 @@ VideoGopSize 12
 # stream basis. The first match defines the action. If there are no matches,
 # then the default is the inverse of the last ACL statement.
 #
-# Thus 'ACL allow localhost' only allows access from localhost. 
+# Thus 'ACL allow localhost' only allows access from localhost.
 # 'ACL deny 1.0.0.0 1.255.255.255' would deny the whole of network 1 and
 # allow everybody else.
 
@@ -170,6 +172,7 @@ VideoGopSize 12
 #VideoFrameRate 2
 #VideoIntraOnly
 #NoAudio
+#Strict -1
 #</Stream>
 
 
@@ -178,10 +181,11 @@ VideoGopSize 12
 #<Stream test.jpg>
 #Feed feed1.ffm
 #Format jpeg
-#VideoFrameRate 2 
+#VideoFrameRate 2
 #VideoIntraOnly
 ##VideoSize 352x240
 #NoAudio
+#Strict -1
 #</Stream>
 
 
@@ -211,7 +215,7 @@ StartSendOnKey
 </Stream>
 
 
-# MP3 audio 
+# MP3 audio
 
 #<Stream test.mp3>
 #Feed feed1.ffm
@@ -306,7 +310,7 @@ StartSendOnKey
 # 'sdp' extension to the stream name (here
 # http://localhost:8090/test1-sdp.sdp). You should usually give this
 # file to your player to play the stream.
-# 
+#
 # The 'NoLoop' option can be used to avoid looping when the stream is
 # terminated.