diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-06-09 20:02:57 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-06-09 20:02:57 +0000 |
| commit | 2adf8482270ef735dc25c0b5cdf629ba7100d264 (patch) | |
| tree | 818ab2198f9fa8bfdd1cb6d6581ba3dd2bf6e3ef | |
| parent | 7dc1bea30ff4b9c0970345c9c82155dc43682c6e (diff) | |
| download | ffmpeg-2adf8482270ef735dc25c0b5cdf629ba7100d264.tar.gz | |
spelling fixes suggested by the Wanderer
Originally committed as revision 4369 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/ffserver.conf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index 6c44564d75..b3d3517b02 100644 --- a/doc/ffserver.conf +++ b/doc/ffserver.conf @@ -75,13 +75,13 @@ 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 (OpenDivX video, MPEG audio sound) # master : special ffmpeg stream used to duplicate a server Format mpeg @@ -89,7 +89,7 @@ Format mpeg # 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 +106,8 @@ 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 VideoSize 160x128 # Transmit only intra frames (useful for low bitrates, but kills frame rate). @@ -261,7 +261,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 |