diff options
| author | James Almer <jamrial@gmail.com> | 2017-08-25 12:09:26 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-08-25 12:19:41 -0300 |
| commit | 2c800eb7375c65ffd56164b03bb035bdb3f1e172 (patch) | |
| tree | 689d1de18ed1b457244081eaa3853a7f2e606d49 /libavcodec | |
| parent | add7b3bc3fb7685cd0a3ccffd2b09cc0e32c39ec (diff) | |
| download | ffmpeg-2c800eb7375c65ffd56164b03bb035bdb3f1e172.tar.gz | |
avcodec: make the avcodec_get_chroma_sub_sample deprecation effective
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 16 | ||||
| -rw-r--r-- | libavcodec/version.h | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c594993766..655555092a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 - * 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 + * @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 diff --git a/libavcodec/version.h b/libavcodec/version.h index 7473000579..48e57bd86b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT #endif -#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 @@ -238,6 +235,9 @@ #ifndef FF_API_TAG_STRING #define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_GETCHROMA +#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |