From bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Mon, 5 Dec 2016 14:24:57 -0500
Subject: [PATCH] lavc: Drop deprecated chroma subsample function
Deprecated in 11/2012.
---
libavcodec/avcodec.h | 6 ------
libavcodec/imgconvert.c | 9 ---------
libavcodec/version.h | 3 ---
3 files changed, 18 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1e2b13e0d79..5f83a36ea0f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4899,12 +4899,6 @@ int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
* @{
*/
-/**
- * @deprecated Use av_pix_fmt_get_chroma_sub_sample
- */
-
-void attribute_deprecated avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
-
/**
* 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 4667a4fb52f..9c8fab59a30 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -33,15 +33,6 @@
#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);
- *h_shift = desc->log2_chroma_w;
- *v_shift = desc->log2_chroma_h;
-}
-#endif
-
static int is_gray(const AVPixFmtDescriptor *desc)
{
return desc->nb_components - (desc->flags & AV_PIX_FMT_FLAG_ALPHA) == 1;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 2b9290316c0..98c93d3bc64 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
*/
-#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
--
GitLab