diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-25 19:45:33 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:03 -0300 |
| commit | d6cb7bf5995fe8af6ad79cf38a7aaa3b4fda6628 (patch) | |
| tree | bff85a211b59fd078124a45a313770332c9f04f2 | |
| parent | f581433e8b70ca015b55c14bf11aadfd652df6b1 (diff) | |
| download | ffmpeg-d6cb7bf5995fe8af6ad79cf38a7aaa3b4fda6628.tar.gz | |
avcodec: Remove deprecated avcodec_get_chroma_sub_sample
Effectively deprecated in 2c800eb7375c65ffd56164b03bb035bdb3f1e172.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/avcodec.h | 9 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 11 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 23 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ff684d17e1..69f69a1aa4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3574,15 +3574,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, * @{ */ -#if FF_API_GETCHROMA -/** - * @deprecated Use av_pix_fmt_get_chroma_sub_sample - */ - -attribute_deprecated -void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); -#endif - /** * 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 8de1563404..a3443d1c72 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -27,23 +27,12 @@ #include "avcodec.h" #include "internal.h" #include "mathops.h" -#include "libavutil/avassert.h" #include "libavutil/colorspace.h" #include "libavutil/common.h" #include "libavutil/pixdesc.h" #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); - av_assert0(desc); - *h_shift = desc->log2_chroma_w; - *v_shift = desc->log2_chroma_h; -} -#endif - #if FF_API_AVCODEC_PIX_FMT int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, diff --git a/libavcodec/version.h b/libavcodec/version.h index 3ca1aab425..96f7e04108 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -81,9 +81,6 @@ #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_GETCHROMA -#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_UNSANITIZED_BITRATES #define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59) #endif |