On Wed, 27 Aug 2014 22:39:29 +0200, James Darnley wrote:
> 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(-)
Pushed.
Thanks!
> 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");
I also fixed the a/an typo in the above line. Hope you don't mind the
meddling.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
