# HG changeset patch # User stefano # Date 1283809880 0 # Node ID 3b8eec1cfdaa2c0078c40f108d847c9e5067ccf9 # Parent 8a62c1403cd00abb03accc95e51bc46a5b09f5d9 Make av_fill_image_max_pixsteps() non static non inline. diff -r 8a62c1403cd0 -r 3b8eec1cfdaa imgutils.c --- a/imgutils.c Wed Sep 01 02:12:03 2010 +0000 +++ b/imgutils.c Mon Sep 06 21:51:20 2010 +0000 @@ -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 -r 8a62c1403cd0 -r 3b8eec1cfdaa imgutils.h --- a/imgutils.h Wed Sep 01 02:12:03 2010 +0000 +++ b/imgutils.h Mon Sep 06 21:51:20 2010 +0000 @@ -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