---
doc/APIchanges | 4 ++++
libavcodec/avcodec.h | 13 +++++++++++++
libavcodec/utils.c | 15 +++++----------
libavcodec/version.h | 3 +++
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 9d8c7725e..a1abcffaa 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,10 @@ libavutil: 2017-03-23
API changes, most recent first:
2017-xx-xx - xxxxxxx - lavc 58.x+1.0 - avcodec.h
+ Deprecate user visibility of the AVHWAccel structure and the functions
+ av_register_hwaccel() and av_hwaccel_next().
+
+2017-xx-xx - xxxxxxx - lavc 58.x+1.0 - avcodec.h
Add AVCodecHWConfig and avcodec_get_hw_config().
2017-xx-xx - xxxxxxx - lavu 56.7.0 - stereo3d.h
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 5d7b3459c..f81a48e47 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2937,6 +2937,10 @@ const AVCodecHWConfig *avcodec_get_hw_config(const
AVCodec *codec, int index);
/**
* @defgroup lavc_hwaccel AVHWAccel
+ *
+ * @note Nothing in this structure should be accessed by the user. At some
+ * point in future it will not be externally visible at all.
+ *
* @{
*/
typedef struct AVHWAccel {
@@ -5015,17 +5019,26 @@ void av_fast_padded_malloc(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
/**
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 3d6b35fa4..ba3457664 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1347,21 +1347,16 @@ const AVCodecHWConfig *avcodec_get_hw_config(const
AVCodec *codec, int index)
return &codec->hw_configs[index]->public;
}
-static AVHWAccel *first_hwaccel = NULL;
-
-void av_register_hwaccel(AVHWAccel *hwaccel)
+#if FF_API_USER_VISIBLE_AVHWACCEL
+AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel)
{
- AVHWAccel **p = &first_hwaccel;
- while (*p)
- p = &(*p)->next;
- *p = hwaccel;
- hwaccel->next = NULL;
+ return NULL;
}
-AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel)
+void av_register_hwaccel(AVHWAccel *hwaccel)
{
- return hwaccel ? hwaccel->next : first_hwaccel;
}
+#endif
int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op))
{
diff --git a/libavcodec/version.h b/libavcodec/version.h
index aa6cdcd6b..09e03328d 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -95,5 +95,8 @@
#ifndef FF_API_VAAPI_CONTEXT
#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
+#ifndef FF_API_USER_VISIBLE_AVHWACCEL
+#define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 60)
+#endif
#endif /* AVCODEC_VERSION_H */
--
2.11.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
