Also replace the plural form "multiplies" with "multiples".
---
This drops the addition of the apostrophe from my earlier patch.
doc/fftools-common-opts.texi | 2 +-
libavcodec/dirac.c | 2 +-
libavcodec/mpeg12enc.c | 2 +-
libavcodec/msvideo1enc.c | 2 +-
libavutil/frame.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 6e6834c..7b6afba 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -3,7 +3,7 @@ representing a number as input, which may be followed by one of
the SI
unit prefixes, for example: 'K', 'M', or 'G'.
If 'i' is appended to the SI unit prefix, the complete prefix will be
-interpreted as a unit prefix for binary multiplies, which are based on
+interpreted as a unit prefix for binary multiples, which are based on
powers of 1024 instead of powers of 1000. Appending 'B' to the SI unit
prefix multiplies the value by 8. This allows using, for example:
'KB', 'MiB', 'G' and 'B' as number suffixes.
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c
index 55553d6..3bbedb3 100644
--- a/libavcodec/dirac.c
+++ b/libavcodec/dirac.c
@@ -239,7 +239,7 @@ static int parse_source_parameters(AVCodecContext *avctx,
GetBitContext *gb,
avctx->pix_fmt = dirac_pix_fmt[!luma_offset][source->chroma_format];
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &chroma_x_shift,
&chroma_y_shift);
if ((source->width % (1<<chroma_x_shift)) || (source->height %
(1<<chroma_y_shift))) {
- av_log(avctx, AV_LOG_ERROR, "Dimensions must be a integer multiply of
the chroma subsampling\n");
+ av_log(avctx, AV_LOG_ERROR, "Dimensions must be a integer multiple of
the chroma subsampling\n");
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 6275a83..827812e 100644
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@ -199,7 +199,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
if ((avctx->width & 0xFFF) == 0 || (avctx->height & 0xFFF) == 0) {
- av_log(avctx, AV_LOG_ERROR, "Width or Height are not allowed to be
multiplies of 4096\n"
+ av_log(avctx, AV_LOG_ERROR, "Width or Height are not allowed to be
multiples of 4096\n"
"add '-strict %d' if you want to use
them anyway.\n", FF_COMPLIANCE_UNOFFICIAL);
return AVERROR(EINVAL);
}
diff --git a/libavcodec/msvideo1enc.c b/libavcodec/msvideo1enc.c
index 6852c98..5e6cdfa 100644
--- a/libavcodec/msvideo1enc.c
+++ b/libavcodec/msvideo1enc.c
@@ -266,7 +266,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return -1;
}
if((avctx->width&3) || (avctx->height&3)){
- av_log(avctx, AV_LOG_ERROR, "width and height must be multiplies of
4\n");
+ av_log(avctx, AV_LOG_ERROR, "width and height must be multiples of
4\n");
return -1;
}
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 2391d3e..ee24628 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -162,7 +162,7 @@ typedef struct AVFrame {
* For audio, only linesize[0] may be set. For planar audio, each channel
* plane must be the same size.
*
- * For video the linesizes should be multiplies of the CPUs alignment
+ * For video the linesizes should be multiples of the CPUs alignment
* preference, this is 16 or 32 for modern desktop CPUs.
* Some code requires such alignment other code can be slower without
* correct alignment, for yet other it makes no difference.
--
1.7.9
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
