| @@ -4899,12 +4899,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, | |||||
| * @{ | * @{ | ||||
| */ | */ | ||||
| /** | |||||
| * @deprecated Use av_pix_fmt_get_chroma_sub_sample | |||||
| */ | |||||
| void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); | |||||
| /** | /** | ||||
| * Return a value representing the fourCC code associated to the | * Return a value representing the fourCC code associated to the | ||||
| * pixel format pix_fmt, or 0 if no associated fourCC code can be | * pixel format pix_fmt, or 0 if no associated fourCC code can be | ||||
| @@ -33,15 +33,6 @@ | |||||
| #include "libavutil/internal.h" | #include "libavutil/internal.h" | ||||
| #include "libavutil/imgutils.h" | #include "libavutil/imgutils.h" | ||||
| #if FF_API_GETCHROMA | |||||
| void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) | |||||
| { | |||||
| const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); | |||||
| *h_shift = desc->log2_chroma_w; | |||||
| *v_shift = desc->log2_chroma_h; | |||||
| } | |||||
| #endif | |||||
| static int is_gray(const AVPixFmtDescriptor *desc) | static int is_gray(const AVPixFmtDescriptor *desc) | ||||
| { | { | ||||
| return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1; | return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1; | ||||
| @@ -47,9 +47,6 @@ | |||||
| * the public API and may change, break or disappear at any time. | * the public API and may change, break or disappear at any time. | ||||
| */ | */ | ||||
| #ifndef FF_API_GETCHROMA | |||||
| #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58) | |||||
| #endif | |||||
| #ifndef FF_API_MISSING_SAMPLE | #ifndef FF_API_MISSING_SAMPLE | ||||
| #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
| #endif | #endif | ||||