Originally committed as revision 25070 to svn://svn.ffmpeg.org/ffmpeg/trunk
Unified · Split
| @@ -152,8 +152,8 @@ void av_image_copy_plane(uint8_t *dst, int dst_linesize, · 151 unmodified lines | |||
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], | 155 | void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], |
| 156 | const uint8_t *src_data[4], const int src_linesize[4], | 156 | const uint8_t *src_data[4], const int src_linesizes[4], |
| 157 | enum PixelFormat pix_fmt, int width, int height) | 157 | enum PixelFormat pix_fmt, int width, int height) |
| 158 | { | 158 | { |
| 159 | const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; | 159 | 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], · 2 unmodified lines | |||
| 162 | return; | 162 | return; |
| 163 | 163 | ||
| 164 | if (desc->flags & PIX_FMT_PAL) { | 164 | if (desc->flags & PIX_FMT_PAL) { |
| 165 | av_image_copy_plane(dst_data[0], dst_linesize[0], | 165 | av_image_copy_plane(dst_data[0], dst_linesizes[0], |
| 166 | src_data[0], src_linesize[0], | 166 | src_data[0], src_linesizes[0], |
| 167 | width, height); | 167 | width, height); |
| 168 | /* copy the palette */ | 168 | /* copy the palette */ |
| 169 | memcpy(dst_data[1], src_data[1], 4*256); | 169 | 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], · 9 unmodified lines | |||
| 179 | if (i == 1 || i == 2) { | 179 | if (i == 1 || i == 2) { |
| 180 | h= -((-height)>>desc->log2_chroma_h); | 180 | h= -((-height)>>desc->log2_chroma_h); |
| 181 | } | 181 | } |
| 182 | av_image_copy_plane(dst_data[i], dst_linesize[i], | 182 | av_image_copy_plane(dst_data[i], dst_linesizes[i], |
| 183 | src_data[i], src_linesize[i], | 183 | src_data[i], src_linesizes[i], |
| 184 | bwidth, h); | 184 | bwidth, h); |
| 185 | } | 185 | } |
| 186 | } | 186 | } |
| @@ -96,8 +96,8 @@ void av_image_copy_plane(uint8_t *dst, int dst_linesize, · 95 unmodified lines | |||
| 96 | * @param dst_linesize linesizes for the image in dst_data | 96 | * @param dst_linesize linesizes for the image in dst_data |
| 97 | * @param src_linesize linesizes for the image in src_data | 97 | * @param src_linesize linesizes for the image in src_data |
| 98 | */ | 98 | */ |
| 99 | void av_image_copy(uint8_t *dst_data[4], int dst_linesize[4], | 99 | void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], |
| 100 | const uint8_t *src_data[4], const int src_linesize[4], | 100 | const uint8_t *src_data[4], const int src_linesizes[4], |
| 101 | enum PixelFormat pix_fmt, int width, int height); | 101 | enum PixelFormat pix_fmt, int width, int height); |
| 102 | 102 | ||
| 103 | /** | 103 | /** |