diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-12 15:06:04 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-12 15:06:04 +0000 |
| commit | 81c1ecabab93ad279092925872cfd13db07a6c6e (patch) | |
| tree | d6134165b62ed1c8f89af474f031034e68d95c68 | |
| parent | 7906e2b974566c897526a8a7561b380687af8323 (diff) | |
| download | ffmpeg-81c1ecabab93ad279092925872cfd13db07a6c6e.tar.gz | |
Deprecate ff_get_plane_bytewidth() in favor of
av_get_image_linesize().
Originally committed as revision 24787 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/imgconvert.c | 4 | ||||
| -rw-r--r-- | libavcodec/imgconvert.h | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 65b40fd435..33bc35477b 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -794,10 +794,12 @@ void ff_img_copy_plane(uint8_t *dst, int dst_wrap, } } +#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 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], 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); diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h index f09fcbfc0e..0f2c2e1713 100644 --- a/libavcodec/imgconvert.h +++ b/libavcodec/imgconvert.h @@ -33,9 +33,10 @@ int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width); attribute_deprecated int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height); -#endif +attribute_deprecated int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); +#endif int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt); diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d6fc895646..a0643c989f 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -21,8 +21,8 @@ /* #define DEBUG */ -#include "libavcodec/imgconvert.h" #include "libavutil/pixdesc.h" +#include "libavcore/imgutils.h" #include "avfilter.h" #include "internal.h" @@ -322,7 +322,7 @@ void avfilter_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) for(i = 0; i < 4; i ++) { int planew = - ff_get_plane_bytewidth(link->format, link->cur_buf->video->w, i); + av_get_image_linesize(link->format, link->cur_buf->video->w, i); if(!src[i]) continue; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index cd274c39e2..e1117dba85 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,7 +26,7 @@ #define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MINOR 34 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |