generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make av_fill_image_max_pixsteps() non static non inline.

Browse Source 
Originally committed as revision 25053 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-09-06 21:51:20 +00:00
parent 3d487db153
commit 0f146263aa
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcore/imgutils.c
View File

@ -24,6 +24,24 @@
#include "imgutils.h" #include "imgutils.h"
#include "libavutil/pixdesc.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) int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane)
{ {
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];

19
libavcore/imgutils.h
View File

@ -43,23 +43,8 @@
* @param max_pixstep_comps 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. * 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], void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
const AVPixFmtDescriptor *pixdesc) 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;
}
}
}
/** /**
* Compute the size of an image line with format pix_fmt and width * Compute the size of an image line with format pix_fmt and width