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

Rename the av_fill_image_linesize() formal parameter linesize to

Browse Source 
linesizes, for consistency with the function declaration.

Originally committed as revision 24591 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini
2010-07-30 08:42:22 +00:00
parent 7d8d18de2c
commit ecc7bfe30c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcore/imgutils.c
View File

@@ -24,20 +24,20 @@
#include "imgutils.h" #include "imgutils.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
int av_fill_image_linesizes(int linesize[4], enum PixelFormat pix_fmt, int width) int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width)
{ {
int i; int i;
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
int max_step [4]; /* max pixel step for each plane */ int max_step [4]; /* max pixel step for each plane */
int max_step_comp[4]; /* the component for each plane which has the max pixel step */ int max_step_comp[4]; /* the component for each plane which has the max pixel step */
memset(linesize, 0, 4*sizeof(linesize[0])); memset(linesizes, 0, 4*sizeof(linesizes[0]));
if (desc->flags & PIX_FMT_HWACCEL) if (desc->flags & PIX_FMT_HWACCEL)
return AVERROR(EINVAL); return AVERROR(EINVAL);
if (desc->flags & PIX_FMT_BITSTREAM) { if (desc->flags & PIX_FMT_BITSTREAM) {
linesize[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3; linesizes[0] = (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
return 0; return 0;
} }
@@ -53,7 +53,7 @@ int av_fill_image_linesizes(int linesize[4], enum PixelFormat pix_fmt, int width
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0; int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0;
linesize[i] = max_step[i] * (((width + (1 << s) - 1)) >> s); linesizes[i] = max_step[i] * (((width + (1 << s) - 1)) >> s);
} }
return 0; return 0;