diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-12-17 18:14:38 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-12-17 18:14:38 +0000 |
| commit | 115329f16062074e11ccf3b89ead6176606c9696 (patch) | |
| tree | e98aa993905a702688bf821737ab9a443969fc28 /doc/ffserver.conf | |
| parent | d76319b1ab716320f6e6a4d690b85fe4504ebd5b (diff) | |
| download | ffmpeg-115329f16062074e11ccf3b89ead6176606c9696.tar.gz | |
COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.conf')
| -rw-r--r-- | doc/ffserver.conf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index 431ef93a94..a3b3ff4129 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -34,7 +34,7 @@ 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 @@ -88,7 +88,7 @@ Feed feed1.ffm 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 @@ -123,7 +123,7 @@ VideoGopSize 12 # VideoHighQuality # Video4MotionVector -# Choose your codecs: +# Choose your codecs: #AudioCodec mp2 #VideoCodec mpeg1video @@ -153,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. @@ -181,7 +181,7 @@ VideoGopSize 12 #<Stream test.jpg> #Feed feed1.ffm #Format jpeg -#VideoFrameRate 2 +#VideoFrameRate 2 #VideoIntraOnly ##VideoSize 352x240 #NoAudio @@ -215,7 +215,7 @@ StartSendOnKey </Stream> -# MP3 audio +# MP3 audio #<Stream test.mp3> #Feed feed1.ffm @@ -310,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. |