[FFmpeg-devel] [PATCH 4/4] lavc: deprecate FF_IDCT_NONE

[Anton Khirnov]

It was only used by XvMC.
---
 libavcodec/avcodec.h | 5 ++++-
 libavcodec/idctdsp.c | 1 -
 libavcodec/version.h | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index acb7ae0e14..5362446092 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1407,7 +1407,10 @@ typedef struct AVCodecContext {
 #define FF_IDCT_SIMPLEARMV6   17
 #define FF_IDCT_FAAN          20
 #define FF_IDCT_SIMPLENEON    22
-#define FF_IDCT_NONE          24 /* Used by XvMC to extract IDCT coefficients with FF_IDCT_PERM_NONE */
+#if FF_API_IDCT_NONE
+// formerly used by xvmc
+#define FF_IDCT_NONE          24
+#endif
 #define FF_IDCT_SIMPLEAUTO    128
 
     /**
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index 71bd03c606..79e7f87443 100644
--- a/libavcodec/idctdsp.c
+++ b/libavcodec/idctdsp.c
@@ -287,7 +287,6 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
                 c->perm_type = FF_IDCT_PERM_NONE;
 #endif /* CONFIG_FAANIDCT */
             } else { // accurate/default
-                /* Be sure FF_IDCT_NONE will select this one, since it uses FF_IDCT_PERM_NONE */
                 c->idct_put  = ff_simple_idct_put_int16_8bit;
                 c->idct_add  = ff_simple_idct_add_int16_8bit;
                 c->idct      = ff_simple_idct_int16_8bit;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index a46fb05f1a..b2c57360cf 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -64,5 +64,6 @@
 #define FF_API_FLAG_TRUNCATED      (LIBAVCODEC_VERSION_MAJOR < 60)
 #define FF_API_SUB_TEXT_FORMAT     (LIBAVCODEC_VERSION_MAJOR < 60)
 #define FF_API_MJPEG_PRED          (LIBAVCODEC_VERSION_MAJOR < 60)
+#define FF_API_IDCT_NONE           (LIBAVCODEC_VERSION_MAJOR < 60)
 
 #endif /* AVCODEC_VERSION_H */
-- 
2.34.1