---
doc/APIchanges | 3 +++
libavutil/pixdesc.c | 4 ++++
libavutil/pixfmt.h | 7 +++++++
libavutil/version.h | 2 +-
4 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 0f7c83957..764449bfe 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2017-03-23
API changes, most recent first:
+2017-06-xx - xxxxxxx - lavu 56.2.1 - pixfmt.h
+ Add AV_PIX_FMT_OPENCL.
+
2017-xx-xx - xxxxxxx - lavc 58.4.0 - avcodec.h
DXVA2 and D3D11 hardware accelerated decoding now supports the new hwaccel
API,
which can create the decoder context and allocate hardware frame
automatically.
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 7fa6dd7c0..61bccfe13 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1743,6 +1743,10 @@ static const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "d3d11",
.flags = AV_PIX_FMT_FLAG_HWACCEL,
},
+ [AV_PIX_FMT_OPENCL] = {
+ .name = "opencl",
+ .flags = AV_PIX_FMT_FLAG_HWACCEL,
+ },
};
#if FF_API_PLUS1_MINUS1
FF_ENABLE_DEPRECATION_WARNINGS
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 2ba7ad1c8..2460d4ddb 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -249,6 +249,13 @@ enum AVPixelFormat {
*/
AV_PIX_FMT_D3D11,
+ /*
+ * Hardware surfaces used in OpenCL.
+ * data[i] contain 2D image objects (typed in C as cl_mem, used
+ * in OpenCL as image2d_t) for each plane of the surface.
+ */
+ AV_PIX_FMT_OPENCL,
+
AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you
want to link with shared libav* because the number of formats might differ
between versions
};
diff --git a/libavutil/version.h b/libavutil/version.h
index 2c85120b6..f5787e5a3 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -55,7 +55,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 2
-#define LIBAVUTIL_VERSION_MICRO 0
+#define LIBAVUTIL_VERSION_MICRO 1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
--
2.11.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel