summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-01-13 14:17:54 +0100
committerAnton Khirnov <anton@khirnov.net>2016-02-14 22:08:22 +0100
commit7bc780cd4413f688d3b834037b0f9ddfd6948140 (patch)
tree8dd8b0f19b9e568a646e401f8544524625102791 /libavutil
parentc51b2c79a7ba084253e892c56dd49ee97115c7de (diff)
pixfmt: add a CUDA hwaccelled format
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/pixdesc.c4
-rw-r--r--libavutil/pixfmt.h6
2 files changed, 10 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 059bd62441..9b948ed2fd 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1577,6 +1577,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "mmal",
.flags = AV_PIX_FMT_FLAG_HWACCEL,
},
+ [AV_PIX_FMT_CUDA] = {
+ .name = "cuda",
+ .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 4e0c0d392e..f2c6c8d232 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -217,6 +217,12 @@ enum AVPixelFormat {
AV_PIX_FMT_D3D11VA_VLD, ///< HW decoding through Direct3D11, Picture.data[3] contains a ID3D11VideoDecoderOutputView pointer
+ /**
+ * HW acceleration through CUDA. data[i] contain CUdeviceptr pointers
+ * exactly as for system memory frames.
+ */
+ AV_PIX_FMT_CUDA,
+
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
};