Skip to content

F
ffmpeg-mt
Commit bb4bbbdf authored by diego's avatar diego
Browse files
Options

spelling fixes suggested by the Wanderer 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@4369 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a55ed80c
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
doc/ffserver.conf
View file @ bb4bbbdf
...@@ -75,13 +75,13 @@ Feed feed1.ffm ...@@ -75,13 +75,13 @@ Feed feed1.ffm
# mpegvideo : only MPEG-1 video # mpegvideo : only MPEG-1 video
# mp2 : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec) # mp2 : MPEG-2 audio (use AudioCodec to select layer 2 and 3 codec)
# ogg : Ogg format (Vorbis audio codec) # ogg : Ogg format (Vorbis audio codec)
# rm : Real Networks compatible stream. Multiplexed audio and video. # rm : RealNetworks-compatible stream. Multiplexed audio and video.
# ra : Real Networks compatible stream. Audio only. # ra : RealNetworks-compatible stream. Audio only.
# mpjpeg : Multipart JPEG (works with Netscape without any plugin) # mpjpeg : Multipart JPEG (works with Netscape without any plugin)
# jpeg : Generate a single JPEG image. # jpeg : Generate a single JPEG image.
# asf : ASF compatible streaming (Windows Media Player format). # asf : ASF compatible streaming (Windows Media Player format).
# swf : Macromedia flash(tm) compatible stream # swf : Macromedia Flash compatible stream
# avi : AVI format (open DivX video, MPEG audio sound) # avi : AVI format (OpenDivX video, MPEG audio sound)
# master : special ffmpeg stream used to duplicate a server # master : special ffmpeg stream used to duplicate a server
Format mpeg Format mpeg
...@@ -89,7 +89,7 @@ Format mpeg ...@@ -89,7 +89,7 @@ Format mpeg
# different bitrates. # different bitrates.
AudioBitRate 32 AudioBitRate 32
# Number of audio channels : 1 = mono, 2 = stereo # Number of audio channels: 1 = mono, 2 = stereo
AudioChannels 1 AudioChannels 1
# Sampling frequency for audio. When using low bitrates, you should # Sampling frequency for audio. When using low bitrates, you should
...@@ -106,8 +106,8 @@ VideoBufferSize 40 ...@@ -106,8 +106,8 @@ VideoBufferSize 40
# Number of frames per second # Number of frames per second
VideoFrameRate 3 VideoFrameRate 3
# Size of the video frame : WxH (default: 160x128) # Size of the video frame: WxH (default: 160x128)
# The following abbreviation are defined : sqcif, qcif, cif, 4cif # The following abbreviations are defined: sqcif, qcif, cif, 4cif
VideoSize 160x128 VideoSize 160x128
# Transmit only intra frames (useful for low bitrates, but kills frame rate). # Transmit only intra frames (useful for low bitrates, but kills frame rate).
...@@ -261,7 +261,7 @@ StartSendOnKey ...@@ -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: # filename and optionally a new format. Supported conversions:
# AVI -> ASF # AVI -> ASF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment