diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1e2b13e0d79b6d6cd6dc8062902758e2cfa4bb01..5f83a36ea0f61b55ca30dec66732dc5cbfafc776 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 * pixel format pix_fmt, or 0 if no associated fourCC code can be diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 4667a4fb52f9cc8ba77341f03f1897115fb92757..9c8fab59a305e547b9d41b45b6b96a209db55116 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -33,15 +33,6 @@ #include "libavutil/internal.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) { return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1; diff --git a/libavcodec/version.h b/libavcodec/version.h index 2b9290316c0f90ca8bcef61fd07f91a526800fee..98c93d3bc647c16fc98a2ca0dab37ce178796f05 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ * 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 #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) #endif