From 0f146263aadd2bbae69c4927f573b7f869612e23 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Mon, 6 Sep 2010 21:51:20 +0000
Subject: [PATCH] Make av_fill_image_max_pixsteps() non static non inline.
Originally committed as revision 25053 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcore/imgutils.c | 18 ++++++++++++++++++
libavcore/imgutils.h | 19 ++-----------------
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c
index ebaeff16c54..2131f0ac14d 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 174a1790093..f42ffb51440 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
--
GitLab