RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

spelling fixes suggested by the Wanderer 

Originally committed as revision 4369 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2005-06-09 20:02:57 +00:00
parent 7dc1bea30f
commit 2adf848227
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/ffserver.conf
View File

@ -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