Mercurial > libavcodec.hg
changeset 12387:e7de1ba6dbc0 libavcodec
Deprecate ff_get_plane_bytewidth() in favor of
av_get_image_linesize().
| author | stefano |
|---|---|
| date | Thu, 12 Aug 2010 15:06:04 +0000 |
| parents | b4b2f1006d9d |
| children | 908559b5bd7c |
| files | imgconvert.c imgconvert.h |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/imgconvert.c Thu Aug 12 15:05:58 2010 +0000 +++ b/imgconvert.c Thu Aug 12 15:06:04 2010 +0000 @@ -794,10 +794,12 @@ } } +#if LIBAVCODEC_VERSION_MAJOR < 53 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane) { return av_get_image_linesize(pix_fmt, width, plane); } +#endif void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], uint8_t *src_data[4], int src_linesize[4], @@ -812,7 +814,7 @@ case FF_PIXEL_PLANAR: for(i = 0; i < pf->nb_channels; i++) { int h; - int bwidth = ff_get_plane_bytewidth(pix_fmt, width, i); + int bwidth = av_get_image_linesize(pix_fmt, width, i); h = height; if (i == 1 || i == 2) { h= -((-height)>>desc->log2_chroma_h);
--- a/imgconvert.h Thu Aug 12 15:05:58 2010 +0000 +++ b/imgconvert.h Thu Aug 12 15:06:04 2010 +0000 @@ -33,10 +33,11 @@ attribute_deprecated int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height); + +attribute_deprecated +int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); #endif -int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); - int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt); #endif /* AVCODEC_IMGCONVERT_H */