const

[ffmpeg] / doc / ffserver.conf

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 6c44564d751c52490b981f0843c55a018190a176..f7db66ed26c67bd271b06fe60923809788ae973b 100644 (file)
--- 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
@@ -75,21 +77,21 @@ Feed feed1.ffm
 # mpegvideo  : only MPEG-1 video
 # mp2        : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec)
 # ogg        : Ogg format (Vorbis audio codec)
-# rm         : Real Networks compatible stream. Multiplexed audio and video.
-# ra         : Real Networks compatible stream. Audio only.
+# rm         : RealNetworks-compatible stream. Multiplexed audio and video.
+# ra         : RealNetworks-compatible stream. Audio only.
 # mpjpeg     : Multipart JPEG (works with Netscape without any plugin)
 # jpeg       : Generate a single JPEG image.
 # asf        : ASF compatible streaming (Windows Media Player format).
-# swf        : Macromedia flash(tm) compatible stream
-# avi        : AVI format (open DivX video, MPEG audio sound)
+# swf        : Macromedia Flash compatible stream
+# 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
+# Number of audio channels: 1 = mono, 2 = stereo
 AudioChannels 1
 
 # Sampling frequency for audio. When using low bitrates, you should
@@ -106,8 +108,11 @@ VideoBufferSize 40
 # Number of frames per second
 VideoFrameRate 3
 
-# Size of the video frame : WxH (default: 160x128)
-# The following abbreviation are defined : sqcif, qcif, cif, 4cif
+# Size of the video frame: WxH (default: 160x128)
+# The following abbreviations are defined: sqcif, qcif, cif, 4cif, qqvga,
+# qvga, vga, svga, xga, uxga, qxga, sxga, qsxga, hsxga, wvga, wxga, wsxga,
+# wuxga, woxga, wqsxga, wquxga, whsxga, whuxga, cga, ega, hd480, hd720,
+# hd1080
 VideoSize 160x128
 
 # Transmit only intra frames (useful for low bitrates, but kills frame rate).
@@ -121,7 +126,7 @@ VideoGopSize 12
 # VideoHighQuality
 # Video4MotionVector
 
-# Choose your codecs: 
+# Choose your codecs:
 #AudioCodec mp2
 #VideoCodec mpeg1video
 
@@ -137,7 +142,7 @@ VideoGopSize 12
 # Set this to the number of seconds backwards in time to start. Note that
 # most players will buffer 5-10 seconds of video, and also you need to allow
 # for a keyframe to appear in the data stream.
-#PreRoll 15
+#Preroll 15
 
 # ACL:
 
@@ -151,7 +156,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 +175,7 @@ VideoGopSize 12
 #VideoFrameRate 2
 #VideoIntraOnly
 #NoAudio
+#Strict -1
 #</Stream>
 
 
@@ -178,10 +184,11 @@ VideoGopSize 12
 #<Stream test.jpg>
 #Feed feed1.ffm
 #Format jpeg
-#VideoFrameRate 2 
+#VideoFrameRate 2
 #VideoIntraOnly
 ##VideoSize 352x240
 #NoAudio
+#Strict -1
 #</Stream>
 
 
@@ -211,7 +218,7 @@ StartSendOnKey
 </Stream>
 
 
-# MP3 audio 
+# MP3 audio
 
 #<Stream test.mp3>
 #Feed feed1.ffm
@@ -261,7 +268,7 @@ StartSendOnKey
 
 
 ##################################################################
-# A stream coming from a file : you only need to set the input
+# A stream coming from a file: you only need to set the input
 # filename and optionally a new format. Supported conversions:
 #    AVI -> ASF
 
@@ -306,7 +313,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.