diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-04-12 21:11:15 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 19:04:01 +0200 |
commit | 9e5c62c97fc0a6ee5764ec69cc6c237b5f70026b (patch) | |
tree | c49364a1050ee1cb61dba8f2b19ddfc514ecc903 /libavutil | |
parent | 516fb5e40cf9d591914096be26ba56fc59294669 (diff) | |
download | ffmpeg-9e5c62c97fc0a6ee5764ec69cc6c237b5f70026b.tar.gz |
lavu: remove FF_API_OLD_IMAGE_NAMES cruft
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/avutil.h | 8 | ||||
-rw-r--r-- | libavutil/imgutils.c | 29 | ||||
-rw-r--r-- | libavutil/imgutils.h | 19 |
3 files changed, 0 insertions, 56 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index edae38eb69..abbdd0642a 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -94,14 +94,6 @@ enum AVMediaType { #define AV_TIME_BASE 1000000 #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} -/** - * Those FF_API_* defines are not part of public API. - * They may change, break or disappear at any time. - */ -#ifndef FF_API_OLD_IMAGE_NAMES -#define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51) -#endif - #include "common.h" #include "error.h" #include "mathematics.h" diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 129fb9555d..544007f120 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -266,32 +266,3 @@ void av_image_copy(uint8_t *dst_data[4], int dst_linesizes[4], } } } - -#if FF_API_OLD_IMAGE_NAMES -void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], - const AVPixFmtDescriptor *pixdesc) -{ - av_image_fill_max_pixsteps(max_pixsteps, max_pixstep_comps, pixdesc); -} - -int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane) -{ - return av_image_get_linesize(pix_fmt, width, plane); -} - -int av_fill_image_linesizes(int linesizes[4], enum PixelFormat pix_fmt, int width) -{ - return av_image_fill_linesizes(linesizes, pix_fmt, width); -} - -int av_fill_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt, int height, - uint8_t *ptr, const int linesizes[4]) -{ - return av_image_fill_pointers(data, pix_fmt, height, ptr, linesizes); -} - -int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *log_ctx) -{ - return av_image_check_size(w, h, log_offset, log_ctx); -} -#endif diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h index 6ebb1b0a6c..7abeb657fb 100644 --- a/libavutil/imgutils.h +++ b/libavutil/imgutils.h @@ -127,23 +127,4 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo int ff_set_systematic_pal2(uint32_t pal[256], enum PixelFormat pix_fmt); -#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 /* AVUTIL_IMGUTILS_H */ |