Browse Source

Make av_fill_image_max_pixsteps() non static non inline.

Originally committed as revision 25053 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Stefano Sabatini 14 years ago
parent
commit
0f146263aa
2 changed files with 20 additions and 17 deletions
  1. +18
    -0
      libavcore/imgutils.c
  2. +2
    -17
      libavcore/imgutils.h

+ 18
- 0
libavcore/imgutils.c View File

@@ -24,6 +24,24 @@
#include "imgutils.h"
#include "libavutil/pixdesc.h"

void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
const AVPixFmtDescriptor *pixdesc)
{
int i;
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_pixsteps[comp->plane]) {
max_pixsteps[comp->plane] = comp->step_minus1+1;
if (max_pixstep_comps)
max_pixstep_comps[comp->plane] = i;
}
}
}

int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane)
{
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];


+ 2
- 17
libavcore/imgutils.h View File

@@ -43,23 +43,8 @@
* @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_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
const AVPixFmtDescriptor *pixdesc)
{
int i;
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_pixsteps[comp->plane]) {
max_pixsteps[comp->plane] = comp->step_minus1+1;
if (max_pixstep_comps)
max_pixstep_comps[comp->plane] = i;
}
}
}
void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
const AVPixFmtDescriptor *pixdesc);

/**
* Compute the size of an image line with format pix_fmt and width


Loading…
Cancel
Save