Unified · Split
| @@ -5665,22 +5665,14 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, · 5664 unmodified lines | |||
| 5665 | * @{ | 5665 | * @{ |
| 5666 | */ | 5666 | */ |
| 5667 | 5667 | ||
| 5668 | #if FF_API_GETCHROMA | ||
| 5668 | /** | 5669 | /** |
| 5669 | * Utility function to access log2_chroma_w log2_chroma_h from | 5670 | * @deprecated Use av_pix_fmt_get_chroma_sub_sample |
| 5670 | * the pixel format AVPixFmtDescriptor. | ||
| 5671 | * | ||
| 5672 | * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample | ||
| 5673 | * for one that returns a failure code and continues in case of invalid | ||
| 5674 | * pix_fmts. | ||
| 5675 | * | ||
| 5676 | * @param[in] pix_fmt the pixel format | ||
| 5677 | * @param[out] h_shift store log2_chroma_w | ||
| 5678 | * @param[out] v_shift store log2_chroma_h | ||
| 5679 | * | ||
| 5680 | * @see av_pix_fmt_get_chroma_sub_sample | ||
| 5681 | */ | 5671 | */ |
| 5682 | 5672 | ||
| 5673 | attribute_deprecated | ||
| 5683 | void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); | 5674 | void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift); |
| 5675 | #endif | ||
| 5684 | 5676 | ||
| 5685 | /** | 5677 | /** |
| 5686 | * Return a value representing the fourCC code associated to the | 5678 | * Return a value representing the fourCC code associated to the |
| @@ -60,9 +60,6 @@ · 59 unmodified lines | |||
| 60 | #ifndef FF_API_AVCODEC_RESAMPLE | 60 | #ifndef FF_API_AVCODEC_RESAMPLE |
| 61 | #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT | 61 | #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT |
| 62 | #endif | 62 | #endif |
| 63 | #ifndef FF_API_GETCHROMA | ||
| 64 | #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58) | ||
| 65 | #endif | ||
| 66 | #ifndef FF_API_MISSING_SAMPLE | 63 | #ifndef FF_API_MISSING_SAMPLE |
| 67 | #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) | 64 | #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) |
| 68 | #endif | 65 | #endif |
| @@ -238,6 +235,9 @@ · 169 unmodified lines | |||
| 238 | #ifndef FF_API_TAG_STRING | 235 | #ifndef FF_API_TAG_STRING |
| 239 | #define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) | 236 | #define FF_API_TAG_STRING (LIBAVCODEC_VERSION_MAJOR < 59) |
| 240 | #endif | 237 | #endif |
| 238 | #ifndef FF_API_GETCHROMA | ||
| 239 | #define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59) | ||
| 240 | #endif | ||
| 241 | 241 | ||
| 242 | 242 | ||
| 243 | #endif /* AVCODEC_VERSION_H */ | 243 | #endif /* AVCODEC_VERSION_H */ |