[FFmpeg-cvslog] r24851 - in trunk: libavcore/avcore.h libavcore/imgutils.c libavcore/imgutils.h libavfilter/avfilter.h libavfilter/vf_crop.c libavfilter/vf_hflip.c
stefano
subversion
Fri Aug 20 18:52:38 CEST 2010
Author: stefano
Date: Fri Aug 20 18:52:38 2010
New Revision: 24851
Log:
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.
Modified:
trunk/libavcore/avcore.h
trunk/libavcore/imgutils.c
trunk/libavcore/imgutils.h
trunk/libavfilter/avfilter.h
trunk/libavfilter/vf_crop.c
trunk/libavfilter/vf_hflip.c
Modified: trunk/libavcore/avcore.h
==============================================================================
--- trunk/libavcore/avcore.h Fri Aug 20 18:34:41 2010 (r24850)
+++ trunk/libavcore/avcore.h Fri Aug 20 18:52:38 2010 (r24851)
@@ -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, \
Modified: trunk/libavcore/imgutils.c
==============================================================================
--- trunk/libavcore/imgutils.c Fri Aug 20 18:34:41 2010 (r24850)
+++ trunk/libavcore/imgutils.c Fri Aug 20 18:52:38 2010 (r24851)
@@ -34,7 +34,7 @@ int av_get_image_linesize(enum PixelForm
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 linesize
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);
Modified: trunk/libavcore/imgutils.h
==============================================================================
--- trunk/libavcore/imgutils.h Fri Aug 20 18:34:41 2010 (r24850)
+++ trunk/libavcore/imgutils.h Fri Aug 20 18:52:38 2010 (r24851)
@@ -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;
}
}
}
Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h Fri Aug 20 18:34:41 2010 (r24850)
+++ trunk/libavfilter/avfilter.h Fri Aug 20 18:52:38 2010 (r24851)
@@ -26,7 +26,7 @@
#define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 36
-#define LIBAVFILTER_VERSION_MICRO 0
+#define LIBAVFILTER_VERSION_MICRO 1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
Modified: trunk/libavfilter/vf_crop.c
==============================================================================
--- trunk/libavfilter/vf_crop.c Fri Aug 20 18:34:41 2010 (r24850)
+++ trunk/libavfilter/vf_crop.c Fri Aug 20 18:52:38 2010 (r24851)
@@ -84,7 +84,7 @@ static int config_input(AVFilterLink *li
CropContext *crop = ctx->priv;
const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[link->format];
- av_fill_image_max_pixstep(crop->max_step, NULL, pix_desc);
+ av_fill_image_max_pixsteps(crop->max_step, NULL, pix_desc);
crop->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
crop->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
Modified: trunk/libavfilter/vf_hflip.c
==============================================================================
--- trunk/libavfilter/vf_hflip.c Fri Aug 20 18:34:41 2010 (r24850)
+++ trunk/libavfilter/vf_hflip.c Fri Aug 20 18:52:38 2010 (r24851)
@@ -70,7 +70,7 @@ static int config_props(AVFilterLink *in
FlipContext *flip = inlink->dst->priv;
const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
- av_fill_image_max_pixstep(flip->max_step, NULL, pix_desc);
+ av_fill_image_max_pixsteps(flip->max_step, NULL, pix_desc);
flip->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w;
flip->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h;
More information about the ffmpeg-cvslog
mailing list