mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
Rename the av_fill_image_linesize() formal parameter linesize to
linesizes, for consistency with the function declaration. Originally committed as revision 24591 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7d8d18de2c
commit
ecc7bfe30c
@ -24,20 +24,20 @@
|
||||
#include "imgutils.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;
|
||||
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
|
||||
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 */
|
||||
|
||||
memset(linesize, 0, 4*sizeof(linesize[0]));
|
||||
memset(linesizes, 0, 4*sizeof(linesizes[0]));
|
||||
|
||||
if (desc->flags & PIX_FMT_HWACCEL)
|
||||
return AVERROR(EINVAL);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@ int av_fill_image_linesizes(int linesize[4], enum PixelFormat pix_fmt, int width
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
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;
|
||||
|
Loading…
Reference in New Issue
Block a user