diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-06 21:51:20 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-06 21:51:20 +0000 |
| commit | 0f146263aadd2bbae69c4927f573b7f869612e23 (patch) | |
| tree | fe68059fcb9798d4b78c95cf7a72128536a73c9a | |
| parent | 3d487db153fb4d149156b65c3ca2d9ab910d84f4 (diff) | |
| download | ffmpeg-0f146263aadd2bbae69c4927f573b7f869612e23.tar.gz | |
Make av_fill_image_max_pixsteps() non static non inline.
Originally committed as revision 25053 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcore/imgutils.c | 18 | ||||
| -rw-r--r-- | libavcore/imgutils.h | 19 |
2 files changed, 20 insertions, 17 deletions
diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c index ebaeff16c5..2131f0ac14 100644 --- a/libavcore/imgutils.c +++ b/libavcore/imgutils.c @@ -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]; diff --git a/libavcore/imgutils.h b/libavcore/imgutils.h index 174a179009..f42ffb5144 100644 --- a/libavcore/imgutils.h +++ b/libavcore/imgutils.h @@ -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 |