Browse Source

avcodec: make the avcodec_get_chroma_sub_sample deprecation effective

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
tags/n3.4
James Almer 8 years ago
parent
commit
2c800eb737
2 changed files with 7 additions and 15 deletions
  1. +4
    -12
      libavcodec/avcodec.h
  2. +3
    -3
      libavcodec/version.h

+ 4
- 12
libavcodec/avcodec.h View File

@@ -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


+ 3
- 3
libavcodec/version.h View File

@@ -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 */

Loading…
Cancel
Save