Mercurial > libavcodec.hg
diff imgconvert.c @ 12466:0a306a267dbf libavcodec
Reimplement ff_img_copy_plane() as av_image_copy_plane() in libavcore,
and deprecate the old function.
author | stefano |
---|---|
date | Tue, 07 Sep 2010 21:23:45 +0000 |
parents | ffb3668ff7af |
children | 94275c8cd57d |
line wrap: on
line diff
--- a/imgconvert.c Tue Sep 07 20:46:29 2010 +0000 +++ b/imgconvert.c Tue Sep 07 21:23:45 2010 +0000 @@ -781,20 +781,14 @@ return dst_pix_fmt; } +#if LIBAVCODEC_VERSION_MAJOR < 53 void ff_img_copy_plane(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height) { - if (!dst || !src) - return; - for(;height > 0; height--) { - memcpy(dst, src, width); - dst += dst_wrap; - src += src_wrap; - } + av_image_copy_plane(dst, dst_wrap, src, src_wrap, width, height); } -#if LIBAVCODEC_VERSION_MAJOR < 53 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane) { return av_image_get_linesize(pix_fmt, width, plane); @@ -819,13 +813,13 @@ if (i == 1 || i == 2) { h= -((-height)>>desc->log2_chroma_h); } - ff_img_copy_plane(dst_data[i], dst_linesize[i], + av_image_copy_plane(dst_data[i], dst_linesize[i], src_data[i], src_linesize[i], bwidth, h); } break; case FF_PIXEL_PALETTE: - ff_img_copy_plane(dst_data[0], dst_linesize[0], + av_image_copy_plane(dst_data[0], dst_linesize[0], src_data[0], src_linesize[0], width, height); /* copy the palette */