Cosmetics: use plural form for *linesizes arguments of
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Tue, 7 Sep 2010 21:24:06 +0000 (21:24 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Tue, 7 Sep 2010 21:24:06 +0000 (21:24 +0000)
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

libavcore/imgutils.c
libavcore/imgutils.h

index 3bbac8b..a2e913b 100644 (file)
@@ -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);
         }
     }
index 38fe618..05c3b50 100644 (file)
@@ -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);
 
 /**