From 2f9cd8861797df5b4d2e36143dfa8268b65cfd38 Mon Sep 17 00:00:00 2001 From: James Almer Date: Mon, 9 Jan 2023 10:40:00 -0300 Subject: [PATCH] avcodec: remove FF_API_UNUSED_CODEC_CAPS Signed-off-by: James Almer --- libavcodec/codec.h | 11 ----------- libavcodec/version_major.h | 1 - 2 files changed, 12 deletions(-) diff --git a/libavcodec/codec.h b/libavcodec/codec.h index 67f9120b44..336a785e18 100644 --- a/libavcodec/codec.h +++ b/libavcodec/codec.h @@ -143,17 +143,6 @@ */ #define AV_CODEC_CAP_AVOID_PROBING (1 << 17) -#if FF_API_UNUSED_CODEC_CAPS -/** - * Deprecated and unused. Use AVCodecDescriptor.props instead - */ -#define AV_CODEC_CAP_INTRA_ONLY 0x40000000 -/** - * Deprecated and unused. Use AVCodecDescriptor.props instead - */ -#define AV_CODEC_CAP_LOSSLESS 0x80000000 -#endif - /** * Codec is backed by a hardware implementation. Typically used to * identify a non-hwaccel hardware decoder. For information about hwaccels, use diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 06e82facbc..269b1f4eaa 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -37,7 +37,6 @@ * at once through the bump. This improves the git bisect-ability of the change. */ -#define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_THREAD_SAFE_CALLBACKS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_DEBUG_MV (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_GET_FRAME_CLASS (LIBAVCODEC_VERSION_MAJOR < 60)