diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-20 20:52:38 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-20 20:52:38 +0400 |
commit | e34433612f475cd940487a2cd14851b0eb7e47b0 (patch) | |
tree | d048e5d68a2a8129aaaf7ed346375c2f7d473a47 /libavcore | |
parent | d1a991f23d45e58aa24b70a1c2f0618e642b2abe (diff) |
Rename av_fill_image_max_pixstep() to av_fill_image_max_pixsteps().
The plural form is preferred as it is more consistent with the other functions:
av_fill_image_linesizes()
av_fill_image_pointers()
and looks semantically more correct as it fills an array of elements.
Originally committed as revision 24851 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcore')
-rw-r--r-- | libavcore/avcore.h | 2 | ||||
-rw-r--r-- | libavcore/imgutils.c | 4 | ||||
-rw-r--r-- | libavcore/imgutils.h | 24 |
3 files changed, 15 insertions, 15 deletions
diff --git a/libavcore/avcore.h b/libavcore/avcore.h index 899de89233..7b7583b7be 100644 --- a/libavcore/avcore.h +++ b/libavcore/avcore.h @@ -27,7 +27,7 @@ #include <libavutil/avutil.h> #define LIBAVCORE_VERSION_MAJOR 0 -#define LIBAVCORE_VERSION_MINOR 5 +#define LIBAVCORE_VERSION_MINOR 6 #define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c index 1fdaaae3b2..686769eefb 100644 --- a/libavcore/imgutils.c +++ b/libavcore/imgutils.c @@ -34,7 +34,7 @@ int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane) if (desc->flags & PIX_FMT_BITSTREAM) return (width * (desc->comp[0].step_minus1+1) + 7) >> 3; - av_fill_image_max_pixstep(max_step, max_step_comp, desc); + av_fill_image_max_pixsteps(max_step, max_step_comp, desc); s = (max_step_comp[plane] == 1 || max_step_comp[plane] == 2) ? desc->log2_chroma_w : 0; return max_step[plane] * (((width + (1 << s) - 1)) >> s); } @@ -56,7 +56,7 @@ int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int widt return 0; } - av_fill_image_max_pixstep(max_step, max_step_comp, desc); + av_fill_image_max_pixsteps(max_step, max_step_comp, desc); for (i = 0; i < 4; i++) { int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0; linesizes[i] = max_step[i] * (((width + (1 << s) - 1)) >> s); diff --git a/libavcore/imgutils.h b/libavcore/imgutils.h index cca0085d3a..174a179009 100644 --- a/libavcore/imgutils.h +++ b/libavcore/imgutils.h @@ -36,27 +36,27 @@ * byte of the successive group in the same plane for the same * component. * - * @param max_pixstep an array which is filled with the max pixel step + * @param max_pixsteps an array which is filled with the max pixel step * for each plane. Since a plane may contain different pixel - * components, the computed max_pixstep[plane] is relative to the + * components, the computed max_pixsteps[plane] is relative to the * component in the plane with the max pixel step. - * @param max_pixstep_comp an array which is filled with the component + * @param max_pixstep_comps an array which is filled with the component * for each plane which has the max pixel step. May be NULL. */ -static inline void av_fill_image_max_pixstep(int max_pixstep[4], int max_pixstep_comp[4], - const AVPixFmtDescriptor *pixdesc) +static inline void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], + const AVPixFmtDescriptor *pixdesc) { int i; - memset(max_pixstep, 0, 4*sizeof(max_pixstep[0])); - if (max_pixstep_comp) - memset(max_pixstep_comp, 0, 4*sizeof(max_pixstep_comp[0])); + memset(max_pixsteps, 0, 4*sizeof(max_pixsteps[0])); + if (max_pixstep_comps) + memset(max_pixstep_comps, 0, 4*sizeof(max_pixstep_comps[0])); for (i = 0; i < 4; i++) { const AVComponentDescriptor *comp = &(pixdesc->comp[i]); - if ((comp->step_minus1+1) > max_pixstep[comp->plane]) { - max_pixstep[comp->plane] = comp->step_minus1+1; - if (max_pixstep_comp) - max_pixstep_comp[comp->plane] = i; + if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) { + max_pixsteps[comp->plane] = comp->step_minus1+1; + if (max_pixstep_comps) + max_pixstep_comps[comp->plane] = i; } } } |