diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-02-01 10:50:31 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-02-15 10:16:16 +0100 |
| commit | b648ece34b6f2576698bea86bcc198a3f4e1f47b (patch) | |
| tree | 12723e756c6753952e0c9c3aa8adce25534dd12f | |
| parent | cefa595361db9d934b52ea7870fd14a4e7110eb1 (diff) | |
| download | ffmpeg-b648ece34b6f2576698bea86bcc198a3f4e1f47b.tar.gz | |
lavc: deprecate FF_IDCT_NONE
It was only used by XvMC.
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/idctdsp.c | 1 | ||||
| -rw-r--r-- | 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 d07dc29207..fbcec8436c 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 b5867ad041..d900503954 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 */ |