ffmpeg | branch: master | Lou Logan <l...@lrcd.com> | Thu Sep 21 15:10:56 2017 -0800| [183fd30e0f6fdc762fd955a24cfc7e6a49e1055c] | committer: Lou Logan
Fix several typos "apix_fmts" found by Marc Péchaud. "speedloss" found by Mikhail V. Signed-off-by: Lou Logan <l...@lrcd.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=183fd30e0f6fdc762fd955a24cfc7e6a49e1055c --- doc/decoders.texi | 4 ++-- doc/encoders.texi | 6 +++--- doc/ffmpeg.texi | 2 +- doc/ffprobe.texi | 2 +- doc/ffserver.texi | 4 ++-- doc/filters.texi | 28 ++++++++++++++-------------- doc/muxers.texi | 2 +- libavformat/segment.c | 4 ++-- libswscale/swscale.c | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index babe129767..d149d2bea5 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -109,7 +109,7 @@ correctly by using lavc's old buggy lpc logic for decoding. @section ffwavesynth -Internal wave synthetizer. +Internal wave synthesizer. This decoder generates wave patterns according to predefined sequences. Its use is purely internal and the format of the data it accepts is not publicly @@ -275,7 +275,7 @@ Y offset of generated bitmaps, default is 0. Chops leading and trailing spaces and removes empty lines from the generated text. This option is useful for teletext based subtitles where empty spaces may be present at the start or at the end of the lines or empty lines may be -present between the subtitle lines because of double-sized teletext charactes. +present between the subtitle lines because of double-sized teletext characters. Default value is 1. @item txt_duration Sets the display duration of the decoded teletext pages or subtitles in diff --git a/doc/encoders.texi b/doc/encoders.texi index 018fb4b07a..fb93ae0094 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -92,12 +92,12 @@ using the value "enable", which is mainly useful for debugging or disabled using @item aac_is Sets intensity stereo coding tool usage. By default, it's enabled and will -automatically toggle IS for similar pairs of stereo bands if it's benefitial. +automatically toggle IS for similar pairs of stereo bands if it's beneficial. Can be disabled for debugging by setting the value to "disable". @item aac_pns Uses perceptual noise substitution to replace low entropy high frequency bands -with imperceivable white noise during the decoding process. By default, it's +with imperceptible white noise during the decoding process. By default, it's enabled, but can be disabled for debugging purposes by using "disable". @item aac_tns @@ -599,7 +599,7 @@ Channel mode @item auto The mode is chosen automatically for each frame @item indep -Chanels are independently coded +Channels are independently coded @item left_side @item right_side @item mid_side diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index de6d3f139a..0405d009b9 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -935,7 +935,7 @@ It disables matching streams from already created mappings. A trailing @code{?} after the stream index will allow the map to be optional: if the map matches no streams the map will be ignored instead of failing. Note the map will still fail if an invalid input file index -is used; such as if the map refers to a non-existant input. +is used; such as if the map refers to a non-existent input. An alternative @var{[linklabel]} form will map outputs from complex filter graphs (see the @option{-filter_complex} option) to the output file. diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index 3572957c8a..e3c34babdc 100644 --- a/doc/ffprobe.texi +++ b/doc/ffprobe.texi @@ -471,7 +471,7 @@ Perform no escaping. @end table @item print_section, p -Print the section name at the begin of each line if the value is +Print the section name at the beginning of each line if the value is @code{1}, disable it with value set to @code{0}. Default value is @code{1}. diff --git a/doc/ffserver.texi b/doc/ffserver.texi index ad48f47a8f..b3e1f1d7ef 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -327,7 +327,7 @@ Name of options and sections are case-insensitive. An ACL (Access Control List) specifies the address which are allowed to access a given stream, or to write a given feed. -It accepts the folling forms +It accepts the following forms @itemize @item Allow/deny access to @var{address}. @@ -416,7 +416,7 @@ deprecated. @item NoDefaults Control whether default codec options are used for the all streams or not. Each stream may overwrite this setting for its own. Default is @var{UseDefaults}. -The lastest occurrence overrides previous if multiple definitions. +The last occurrence overrides the previous if multiple definitions exist. @end table @section Feed section diff --git a/doc/filters.texi b/doc/filters.texi index 830de54909..b09c3a0538 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -601,7 +601,7 @@ separated by '|'. Allowed range for each @code{delay} is @code{(0 - 90000.0]}. Default is @code{1000}. @item decays -Set list of loudnesses of reflected signals separated by '|'. +Set list of loudness of reflected signals separated by '|'. Allowed range for each @code{decay} is @code{(0 - 1.0]}. Default is @code{0.5}. @end table @@ -2744,7 +2744,7 @@ The filter accepts the following options: Set base delay in milliseconds. Range from 0 to 30. Default value is 0. @item depth -Set added swep delay in milliseconds. Range from 0 to 10. Default value is 2. +Set added sweep delay in milliseconds. Range from 0 to 10. Default value is 2. @item regen Set percentage regeneration (delayed signal feedback). Range from -95 to 95. @@ -2775,7 +2775,7 @@ Apply Haas effect to audio. Note that this makes most sense to apply on mono signals. With this filter applied to mono signals it give some directionality and -streches its stereo image. +stretches its stereo image. The filter accepts the following options: @@ -3750,7 +3750,7 @@ Default is @var{freq}. Set custom positions of virtual loudspeakers. Syntax for this option is: <CH> <AZIM> <ELEV>[|<CH> <AZIM> <ELEV>|...]. Each virtual loudspeaker is described with short channel name following with -azimuth and elevation in degreees. +azimuth and elevation in degrees. Each virtual loudspeaker description is separated by '|'. For example to override front left and front right channel positions use: 'speakers=FL 45 15|FR 345 15'. @@ -5267,7 +5267,7 @@ the more similar the pixels color is to the key color. @item yuv Signals that the color passed is already in YUV instead of RGB. -Litteral colors like "green" or "red" don't make sense with this enabled anymore. +Literal colors like "green" or "red" don't make sense with this enabled anymore. This can be used to pass exact YUV values as hexadecimal numbers. @end table @@ -6911,14 +6911,14 @@ Set how spillmap will be generated. Set how much to get rid of still remaining spill. @item red -Controls ammount of red in spill area. +Controls amount of red in spill area. @item green -Controls ammount of green in spill area. +Controls amount of green in spill area. Should be -1 for greenscreen. @item blue -Controls ammount of blue in spill area. +Controls amount of blue in spill area. Should be -1 for bluescreen. @item brightness @@ -10553,7 +10553,7 @@ A description of the accepted options follows. @item max Set the maximum number of consecutive frames which can be dropped (if positive), or the minimum interval between dropped frames (if -negative). If the value is 0, the frame is dropped unregarding the +negative). If the value is 0, the frame is dropped disregarding the number of previous sequentially dropped frames. Default value is 0. @@ -10675,7 +10675,7 @@ Can be one of the following: @end table @item nns -Set the number of neurons in predicctor neural network. +Set the number of neurons in predictor neural network. Can be one of the following: @table @samp @@ -10738,7 +10738,7 @@ It accepts the following parameters: @item pix_fmts A '|'-separated list of pixel format names, such as -apix_fmts=yuv420p|monow|rgb24". +pix_fmts=yuv420p|monow|rgb24". @end table @@ -12199,7 +12199,7 @@ the following constants: 1 if index is not 129, 0 otherwise. @item qp -Sequentional index starting from -129 to 128. +Sequential index starting from -129 to 128. @end table @subsection Examples @@ -14723,7 +14723,7 @@ Preserve overall image brightness with a simple curve, using nonlinear contrast, which results in flattening details and degrading color accuracy. @item hable -Peserve both dark and bright details better than @var{reinhard}, at the cost +Preserve both dark and bright details better than @var{reinhard}, at the cost of slightly darkening everything. Use it when detail preservation is more important than color and brightness accuracy. @@ -17710,7 +17710,7 @@ perms/aperms filter can avoid this problem. @section realtime, arealtime -Slow down filtering to match real time approximatively. +Slow down filtering to match real time approximately. These filters will pause the filtering for a variable amount of time to match the output rate with the input timestamps. diff --git a/doc/muxers.texi b/doc/muxers.texi index 5a4f17bf8d..36769b8c1a 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1566,7 +1566,7 @@ inconsistent, but may make things worse on others, and can cause some oddities during seeking. Defaults to @code{0}. @item reset_timestamps @var{1|0} -Reset timestamps at the begin of each segment, so that each segment +Reset timestamps at the beginning of each segment, so that each segment will start with near-zero timestamps. It is meant to ease the playback of the generated segments. May not work with some combinations of muxers/codecs. It is set to @code{0} by default. diff --git a/libavformat/segment.c b/libavformat/segment.c index b0ef6dd38e..81d3f1d940 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -111,7 +111,7 @@ typedef struct SegmentContext { int write_header_trailer; /**< Set by a private option. */ char *header_filename; ///< filename to write the output header to - int reset_timestamps; ///< reset timestamps at the begin of each segment + int reset_timestamps; ///< reset timestamps at the beginning of each segment int64_t initial_offset; ///< initial timestamps offset, expressed in microseconds char *reference_stream_specifier; ///< reference stream specifier int reference_stream_index; @@ -1052,7 +1052,7 @@ static const AVOption options[] = { { "individual_header_trailer", "write header/trailer to each segment", OFFSET(individual_header_trailer), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E }, { "write_header_trailer", "write a header to the first segment and a trailer to the last one", OFFSET(write_header_trailer), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E }, - { "reset_timestamps", "reset timestamps at the begin of each segment", OFFSET(reset_timestamps), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, + { "reset_timestamps", "reset timestamps at the beginning of each segment", OFFSET(reset_timestamps), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, { "initial_offset", "set initial timestamp offset", OFFSET(initial_offset), AV_OPT_TYPE_DURATION, {.i64 = 0}, -INT64_MAX, INT64_MAX, E }, { "write_empty_segments", "allow writing empty 'filler' segments", OFFSET(write_empty), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, { NULL }, diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ba66314c7d..7f3e22355f 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -326,7 +326,7 @@ static int swscale(SwsContext *c, const uint8_t *src[], static int warnedAlready=0; int cpu_flags = av_get_cpu_flags(); if (HAVE_MMXEXT && (cpu_flags & AV_CPU_FLAG_SSE2) && !warnedAlready){ - av_log(c, AV_LOG_WARNING, "Warning: data is not aligned! This can lead to a speedloss\n"); + av_log(c, AV_LOG_WARNING, "Warning: data is not aligned! This can lead to a speed loss\n"); warnedAlready=1; } } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
