Commit 2b3cd04d authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Cosmetics: use plural form for *linesizes arguments of

av_image_copy(), more consistent with the rest of the API and more
semantically correct.

Originally committed as revision 25070 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9d2e0ad8
...@@ -152,8 +152,8 @@ void av_image_copy_plane(uint8_t *dst, int dst_linesize, ...@@ -152,8 +152,8 @@ void av_image_copy_plane(uint8_t *dst, int dst_linesize,
} }
} }
void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
const uint8_t *src_data[4], const int src_linesize[4], const uint8_t *src_data[4], const int src_linesizes[4],
enum PixelFormat pix_fmt, int width, int height) enum PixelFormat pix_fmt, int width, int height)
{ {
const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
...@@ -162,8 +162,8 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], ...@@ -162,8 +162,8 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4],
return; return;
if (desc->flags & PIX_FMT_PAL) { if (desc->flags & PIX_FMT_PAL) {
av_image_copy_plane(dst_data[0], dst_linesize[0], av_image_copy_plane(dst_data[0], dst_linesizes[0],
src_data[0], src_linesize[0], src_data[0], src_linesizes[0],
width, height); width, height);
/* copy the palette */ /* copy the palette */
memcpy(dst_data[1], src_data[1], 4*256); memcpy(dst_data[1], src_data[1], 4*256);
...@@ -179,8 +179,8 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], ...@@ -179,8 +179,8 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4],
if (i == 1 || i == 2) { if (i == 1 || i == 2) {
h= -((-height)>>desc->log2_chroma_h); h= -((-height)>>desc->log2_chroma_h);
} }
av_image_copy_plane(dst_data[i], dst_linesize[i], av_image_copy_plane(dst_data[i], dst_linesizes[i],
src_data[i], src_linesize[i], src_data[i], src_linesizes[i],
bwidth, h); bwidth, h);
} }
} }
......
...@@ -96,8 +96,8 @@ void av_image_copy_plane(uint8_t *dst, int dst_linesize, ...@@ -96,8 +96,8 @@ void av_image_copy_plane(uint8_t *dst, int dst_linesize,
* @param dst_linesize linesizes for the image in dst_data * @param dst_linesize linesizes for the image in dst_data
* @param src_linesize linesizes for the image in src_data * @param src_linesize linesizes for the image in src_data
*/ */
void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4],
const uint8_t *src_data[4], const int src_linesize[4], const uint8_t *src_data[4], const int src_linesizes[4],
enum PixelFormat pix_fmt, int width, int height); enum PixelFormat pix_fmt, int width, int height);
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment