[FFmpeg-cvslog] r25053 - in trunk/libavcore: imgutils.c imgutils.h
stefano
subversion
Mon Sep 6 23:51:21 CEST 2010
Author: stefano
Date: Mon Sep 6 23:51:20 2010
New Revision: 25053
Log:
Make av_fill_image_max_pixsteps() non static non inline.
Modified:
trunk/libavcore/imgutils.c
trunk/libavcore/imgutils.h
Modified: trunk/libavcore/imgutils.c
==============================================================================
--- trunk/libavcore/imgutils.c Mon Sep 6 21:26:18 2010 (r25052)
+++ trunk/libavcore/imgutils.c Mon Sep 6 23:51:20 2010 (r25053)
@@ -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];
Modified: trunk/libavcore/imgutils.h
==============================================================================
--- trunk/libavcore/imgutils.h Mon Sep 6 21:26:18 2010 (r25052)
+++ trunk/libavcore/imgutils.h Mon Sep 6 23:51:20 2010 (r25053)
@@ -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
More information about the ffmpeg-cvslog
mailing list