diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 19:15:17 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-07 19:15:17 +0000 |
| commit | 9b7269e379289e240404c803acac25c607bb0e26 (patch) | |
| tree | 0f6312c2dfd2428331a19cae2ff215298965d865 /libavcore/imgutils.h | |
| parent | 4906e7b507f184c4934060430b6beedcea4dbf34 (diff) | |
| download | ffmpeg-9b7269e379289e240404c803acac25c607bb0e26.tar.gz | |
Adopt a hierarchical name scheme for the imgutils.h API. Simplify
grepping and somewhat more consistent with the scheme adopted by other
FFmpeg modules API.
Originally committed as revision 25057 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcore/imgutils.h')
| -rw-r--r-- | libavcore/imgutils.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/libavcore/imgutils.h b/libavcore/imgutils.h index f42ffb5144..291c872419 100644 --- a/libavcore/imgutils.h +++ b/libavcore/imgutils.h @@ -43,7 +43,7 @@ * @param max_pixstep_comps an array which is filled with the component * for each plane which has the max pixel step. May be NULL. */ -void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], +void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], const AVPixFmtDescriptor *pixdesc); /** @@ -52,7 +52,7 @@ void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], * * @return the computed size in bytes */ -int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane); +int av_image_get_linesize(enum PixelFormat pix_fmt, int width, int plane); /** * Fill plane linesizes for an image with pixel format pix_fmt and @@ -61,7 +61,7 @@ int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane); * @param linesizes array to be filled with the linesize for each plane * @return >= 0 in case of success, a negative error code otherwise */ -int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width); +int av_image_fill_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width); /** * Fill plane data pointers for an image with pixel format pix_fmt and @@ -74,7 +74,7 @@ int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int widt * @return the size in bytes required for the image buffer, a negative * error code in case of failure */ -int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height, +int av_image_fill_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height, uint8_t *ptr, const int linesizes[4]); /** @@ -87,6 +87,25 @@ int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int heigh * @param log_ctx the parent logging context, it may be NULL * @return >= 0 if valid, a negative error code otherwise */ +int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx); + +#if FF_API_OLD_IMAGE_NAMES +attribute_deprecated +void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], + const AVPixFmtDescriptor *pixdesc); + +attribute_deprecated +int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane); + +attribute_deprecated +int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width); + +attribute_deprecated +int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height, + uint8_t *ptr, const int linesizes[4]); + +attribute_deprecated int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx); +#endif #endif /* AVCORE_IMGUTILS_H */ |