aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Darnley <james.darnley@gmail.com>2014-08-27 22:39:29 +0200
committerLou Logan <lou@lrcd.com>2014-08-27 16:00:17 -0800
commit8c1b942ad7b66034b030f2ab3cc5e81eccfa2b68 (patch)
treea0fdbca8a2983e64917ce6ee1c2abffc914c42a3 /libavcodec
parente6516944a3d504f208911033b31afedb3d427267 (diff)
downloadffmpeg-8c1b942ad7b66034b030f2ab3cc5e81eccfa2b68.tar.gz
Replace incorrect use of "multiply" with "multiple"
Also replace the plural form "multiplies" with "multiples".
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dirac.c2
-rw-r--r--libavcodec/mpeg12enc.c2
-rw-r--r--libavcodec/msvideo1enc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c
index 55553d67ee..aa55e776fb 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 an integer multiple of the chroma subsampling\n");
return AVERROR_INVALIDDATA;
}
diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c
index 6275a83667..827812ef55 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 6852c9868c..5e6cdfa3f8 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;
}