diff mbox series

[FFmpeg-devel,v2,09/33] avcodec: remove FF_API_UNUSED_CODEC_CAPS

Message ID 20230204104204.20721-10-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,v2,01/33] avformat/avformat: Remove AVOutputFormat.data_codec | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Anton Khirnov Feb. 4, 2023, 10:41 a.m. UTC 
From: James Almer <jamrial@gmail.com>

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/codec.h         | 11 -----------
 libavcodec/version_major.h |  1 -
 2 files changed, 12 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/codec.h b/libavcodec/codec.h
index 77a1a3f5a29..e10fcb9c7c2 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 cd4830c69ae..7b561940b0c 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)