diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 21:24:06 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 21:24:06 +0000 |
| commit | 2b3cd04d889e9f3391a0a8245bf3b3f53860f5fd (patch) | |
| tree | 855aa86dcebf0e366aae7f7b4b73c38aaed19d0c | |
| parent | 9d2e0ad824becfca3768b2d26674f43cc70948d8 (diff) | |
| download | ffmpeg-2b3cd04d889e9f3391a0a8245bf3b3f53860f5fd.tar.gz | |
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
| -rw-r--r-- | libavcore/imgutils.c | 12 | ||||
| -rw-r--r-- | libavcore/imgutils.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c index 3bbac8b031..a2e913b5ba 100644 --- a/libavcore/imgutils.c +++ b/libavcore/imgutils.c @@ -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], - const uint8_t *src_data[4], const int src_linesize[4], +void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], + const uint8_t *src_data[4], const int src_linesizes[4], enum PixelFormat pix_fmt, int width, int height) { 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], return; if (desc->flags & PIX_FMT_PAL) { - av_image_copy_plane(dst_data[0], dst_linesize[0], - src_data[0], src_linesize[0], + av_image_copy_plane(dst_data[0], dst_linesizes[0], + src_data[0], src_linesizes[0], width, height); /* copy the palette */ 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], if (i == 1 || i == 2) { h= -((-height)>>desc->log2_chroma_h); } - av_image_copy_plane(dst_data[i], dst_linesize[i], - src_data[i], src_linesize[i], + av_image_copy_plane(dst_data[i], dst_linesizes[i], + src_data[i], src_linesizes[i], bwidth, h); } } diff --git a/libavcore/imgutils.h b/libavcore/imgutils.h index 38fe618f50..05c3b500f1 100644 --- a/libavcore/imgutils.h +++ b/libavcore/imgutils.h @@ -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 src_linesize linesizes for the image in src_data */ -void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], - const uint8_t *src_data[4], const int src_linesize[4], +void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], + const uint8_t *src_data[4], const int src_linesizes[4], enum PixelFormat pix_fmt, int width, int height); /** |