[FFmpeg-cvslog] avcodec: Remove remnants of user-visiable HW acceleration API
Andreas Rheinhardt
git at videolan.org
Wed Apr 28 00:14:36 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Feb 25 19:39:58 2021 +0100| [f581433e8b70ca015b55c14bf11aadfd652df6b1] | committer: James Almer
avcodec: Remove remnants of user-visiable HW acceleration API
Disabled and deprecated in 3536a3efb9fde88d34d526a51b1080247326cd6e.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f581433e8b70ca015b55c14bf11aadfd652df6b1
---
libavcodec/avcodec.h | 21 ---------------------
libavcodec/utils.c | 11 -----------
libavcodec/version.h | 3 ---
3 files changed, 35 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7c6f5c1fc0..ff684d17e1 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3778,27 +3778,6 @@ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size);
*/
unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
-#if FF_API_USER_VISIBLE_AVHWACCEL
-/**
- * Register the hardware accelerator hwaccel.
- *
- * @deprecated This function doesn't do anything.
- */
-attribute_deprecated
-void av_register_hwaccel(AVHWAccel *hwaccel);
-
-/**
- * If hwaccel is NULL, returns the first registered hardware accelerator,
- * if hwaccel is non-NULL, returns the next registered hardware accelerator
- * after hwaccel, or NULL if hwaccel is the last one.
- *
- * @deprecated AVHWaccel structures contain no user-serviceable parts, so
- * this function should not be used.
- */
-attribute_deprecated
-AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel);
-#endif
-
/**
* @return a positive value if s is open (i.e. avcodec_open2() was called on it
* with no corresponding avcodec_close()), 0 otherwise.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index fda50e3db4..9cee989098 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -845,17 +845,6 @@ const AVCodecHWConfig *avcodec_get_hw_config(const AVCodec *codec, int index)
return &codec->hw_configs[index]->public;
}
-#if FF_API_USER_VISIBLE_AVHWACCEL
-AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel)
-{
- return NULL;
-}
-
-void av_register_hwaccel(AVHWAccel *hwaccel)
-{
-}
-#endif
-
unsigned int avpriv_toupper4(unsigned int x)
{
return av_toupper(x & 0xFF) +
diff --git a/libavcodec/version.h b/libavcodec/version.h
index e76ec915f9..3ca1aab425 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -84,9 +84,6 @@
#ifndef FF_API_GETCHROMA
#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
-#ifndef FF_API_USER_VISIBLE_AVHWACCEL
-#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
#ifndef FF_API_UNSANITIZED_BITRATES
#define FF_API_UNSANITIZED_BITRATES (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
More information about the ffmpeg-cvslog
mailing list