From ecc7bfe30c595cbe14a2b77db647e9fec1bc5d79 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 30 Jul 2010 08:42:22 +0000 Subject: [PATCH] Rename the av_fill_image_linesize() formal parameter linesize to linesizes, for consistency with the function declaration. Originally committed as revision 24591 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcore/imgutils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c index 3f7cbc1b4a..54c10d2d45 100644 --- a/libavcore/imgutils.c +++ b/libavcore/imgutils.c @@ -24,20 +24,20 @@ #include "imgutils.h" #include "libavutil/pixdesc.h" -int av_fill_image_linesizes(int linesize[4], enum PixelFormat pix_fmt, int width) +int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width) { int i; const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; int max_step [4]; /* max pixel step for each plane */ int max_step_comp[4]; /* the component for each plane which has the max pixel step */ - memset(linesize, 0, 4*sizeof(linesize[0])); + memset(linesizes, 0, 4*sizeof(linesizes[0])); if (desc->flags & PIX_FMT_HWACCEL) return AVERROR(EINVAL); if (desc->flags & PIX_FMT_BITSTREAM) { - linesize[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3; + linesizes[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3; return 0; } @@ -53,7 +53,7 @@ int av_fill_image_linesizes(int linesize[4], enum PixelFormat pix_fmt, int width for (i = 0; i < 4; i++) { int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0; - linesize[i] = max_step[i] * (((width + (1 << s) - 1)) >> s); + linesizes[i] = max_step[i] * (((width + (1 << s) - 1)) >> s); } return 0;