Replace incorrect use of "multiply" with "multiple"

Also replace the plural form "multiplies" with "multiples".
pull/88/head
James Darnley 11 years ago committed by Lou Logan
parent e6516944a3
commit 8c1b942ad7
  1. 2
      doc/fftools-common-opts.texi
  2. 2
      libavcodec/dirac.c
  3. 2
      libavcodec/mpeg12enc.c
  4. 2
      libavcodec/msvideo1enc.c
  5. 2
      libavutil/frame.h

@ -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'. unit prefixes, for example: 'K', 'M', or 'G'.
If 'i' is appended to the SI unit prefix, the complete prefix will be 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 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: prefix multiplies the value by 8. This allows using, for example:
'KB', 'MiB', 'G' and 'B' as number suffixes. 'KB', 'MiB', 'G' and 'B' as number suffixes.

@ -239,7 +239,7 @@ static int parse_source_parameters(AVCodecContext *avctx, GetBitContext *gb,
avctx->pix_fmt = dirac_pix_fmt[!luma_offset][source->chroma_format]; 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); 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))) { 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; return AVERROR_INVALIDDATA;
} }

@ -199,7 +199,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { if (s->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
if ((avctx->width & 0xFFF) == 0 || (avctx->height & 0xFFF) == 0) { 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); "add '-strict %d' if you want to use them anyway.\n", FF_COMPLIANCE_UNOFFICIAL);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }

@ -266,7 +266,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
return -1; return -1;
} }
if((avctx->width&3) || (avctx->height&3)){ 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; return -1;
} }

@ -162,7 +162,7 @@ typedef struct AVFrame {
* For audio, only linesize[0] may be set. For planar audio, each channel * For audio, only linesize[0] may be set. For planar audio, each channel
* plane must be the same size. * 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. * preference, this is 16 or 32 for modern desktop CPUs.
* Some code requires such alignment other code can be slower without * Some code requires such alignment other code can be slower without
* correct alignment, for yet other it makes no difference. * correct alignment, for yet other it makes no difference.

Loading…
Cancel
Save