Commit 2c800eb7 authored by James Almer's avatar James Almer

avcodec: make the avcodec_get_chroma_sub_sample deprecation effective

Reviewed-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent add7b3bc
...@@ -5665,22 +5665,14 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, ...@@ -5665,22 +5665,14 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
* @{ * @{
*/ */
#if FF_API_GETCHROMA
/** /**
* Utility function to access log2_chroma_w log2_chroma_h from * @deprecated Use av_pix_fmt_get_chroma_sub_sample
* the pixel format AVPixFmtDescriptor.
*
* This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample
* for one that returns a failure code and continues in case of invalid
* pix_fmts.
*
* @param[in] pix_fmt the pixel format
* @param[out] h_shift store log2_chroma_w
* @param[out] v_shift store log2_chroma_h
*
* @see 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); 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 * Return a value representing the fourCC code associated to the
......
...@@ -60,9 +60,6 @@ ...@@ -60,9 +60,6 @@
#ifndef FF_API_AVCODEC_RESAMPLE #ifndef FF_API_AVCODEC_RESAMPLE
#define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT
#endif #endif
#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
...@@ -238,6 +235,9 @@ ...@@ -238,6 +235,9 @@
#ifndef FF_API_TAG_STRING #ifndef FF_API_TAG_STRING
#define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_GETCHROMA
#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment