| @@ -94,14 +94,6 @@ enum AVMediaType { | |||||
| #define AV_TIME_BASE 1000000 | #define AV_TIME_BASE 1000000 | ||||
| #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} | #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 "common.h" | ||||
| #include "error.h" | #include "error.h" | ||||
| #include "mathematics.h" | #include "mathematics.h" | ||||
| @@ -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 | |||||
| @@ -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); | 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 */ | #endif /* AVUTIL_IMGUTILS_H */ | ||||