History

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

Stefano Sabatini committed 16 years ago

Commit e3443361 parent d1a991f6 files · +18 −18Browse files

Unified · Split

6 files
  1. libavcore/avcore.h +1 −1
  2. libavcore/imgutils.c +2 −2
  3. libavcore/imgutils.h +12 −12
  4. libavfilter/avfilter.h +1 −1
  5. libavfilter/vf_crop.c +1 −1
  6. libavfilter/vf_hflip.c +1 −1
libavcore/avcore.h+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <libavutil/avutil.h>
2828
2929 #define LIBAVCORE_VERSION_MAJOR 0
30−#define LIBAVCORE_VERSION_MINOR 5
30+#define LIBAVCORE_VERSION_MINOR 6
3131 #define LIBAVCORE_VERSION_MICRO 0
3232
3333 #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
libavcore/imgutils.c+2−2
@@ -34,7 +34,7 @@ int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane) · 33 unmodified lines
3434 if (desc->flags & PIX_FMT_BITSTREAM)
3535 return (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
3636
37− av_fill_image_max_pixstep(max_step, max_step_comp, desc);
37+ av_fill_image_max_pixsteps(max_step, max_step_comp, desc);
3838 s = (max_step_comp[plane] == 1 || max_step_comp[plane] == 2) ? desc->log2_chroma_w : 0;
3939 return max_step[plane] * (((width + (1 << s) - 1)) >> s);
4040 }
@@ -56,7 +56,7 @@ int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int widt · 15 unmodified lines
5656 return 0;
5757 }
5858
59− av_fill_image_max_pixstep(max_step, max_step_comp, desc);
59+ av_fill_image_max_pixsteps(max_step, max_step_comp, desc);
6060 for (i = 0; i < 4; i++) {
6161 int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0;
6262 linesizes[i] = max_step[i] * (((width + (1 << s) - 1)) >> s);
libavcore/imgutils.h+12−12
@@ -36,27 +36,27 @@ · 35 unmodified lines
3636 * byte of the successive group in the same plane for the same
3737 * component.
3838 *
39− * @param max_pixstep an array which is filled with the max pixel step
39+ * @param max_pixsteps an array which is filled with the max pixel step
4040 * for each plane. Since a plane may contain different pixel
41− * components, the computed max_pixstep[plane] is relative to the
41+ * components, the computed max_pixsteps[plane] is relative to the
4242 * component in the plane with the max pixel step.
43− * @param max_pixstep_comp an array which is filled with the component
43+ * @param max_pixstep_comps an array which is filled with the component
4444 * for each plane which has the max pixel step. May be NULL.
4545 */
46−static inline void av_fill_image_max_pixstep(int max_pixstep[4], int max_pixstep_comp[4],
47− const AVPixFmtDescriptor *pixdesc)
46+static inline void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
47+ const AVPixFmtDescriptor *pixdesc)
4848 {
4949 int i;
50− memset(max_pixstep, 0, 4*sizeof(max_pixstep[0]));
51− if (max_pixstep_comp)
52− memset(max_pixstep_comp, 0, 4*sizeof(max_pixstep_comp[0]));
50+ memset(max_pixsteps, 0, 4*sizeof(max_pixsteps[0]));
51+ if (max_pixstep_comps)
52+ memset(max_pixstep_comps, 0, 4*sizeof(max_pixstep_comps[0]));
5353
5454 for (i = 0; i < 4; i++) {
5555 const AVComponentDescriptor *comp = &(pixdesc->comp[i]);
56− if ((comp->step_minus1+1) > max_pixstep[comp->plane]) {
57− max_pixstep[comp->plane] = comp->step_minus1+1;
58− if (max_pixstep_comp)
59− max_pixstep_comp[comp->plane] = i;
56+ if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) {
57+ max_pixsteps[comp->plane] = comp->step_minus1+1;
58+ if (max_pixstep_comps)
59+ max_pixstep_comps[comp->plane] = i;
6060 }
6161 }
6262 }
libavfilter/avfilter.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626
2727 #define LIBAVFILTER_VERSION_MAJOR 1
2828 #define LIBAVFILTER_VERSION_MINOR 36
29−#define LIBAVFILTER_VERSION_MICRO 0
29+#define LIBAVFILTER_VERSION_MICRO 1
3030
3131 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
3232 LIBAVFILTER_VERSION_MINOR, \
libavfilter/vf_crop.c+1−1
@@ -84,7 +84,7 @@ static int config_input(AVFilterLink *link) · 83 unmodified lines
8484 CropContext *crop = ctx->priv;
8585 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[link->format];
8686
87− av_fill_image_max_pixstep(crop->max_step, NULL, pix_desc);
87+ av_fill_image_max_pixsteps(crop->max_step, NULL, pix_desc);
8888 crop->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
8989 crop->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
9090
libavfilter/vf_hflip.c+1−1
@@ -70,7 +70,7 @@ static int config_props(AVFilterLink *inlink) · 69 unmodified lines
7070 FlipContext *flip = inlink->dst->priv;
7171 const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
7272
73− av_fill_image_max_pixstep(flip->max_step, NULL, pix_desc);
73+ av_fill_image_max_pixsteps(flip->max_step, NULL, pix_desc);
7474 flip->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w;
7575 flip->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h;
7676

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t