diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 15:11:06 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 15:11:06 +0000 |
| commit | 63c3e35332838fca19b7ffdae13233b0f3759402 (patch) | |
| tree | 020d2f04eb2de6bf54a52770a954bc5873462f2f /libavutil/pixdesc.c | |
| parent | 9f2c1c77d2098168761421febbbdb0abf0fd6cce (diff) | |
| parent | 7bc780cd4413f688d3b834037b0f9ddfd6948140 (diff) | |
| download | ffmpeg-63c3e35332838fca19b7ffdae13233b0f3759402.tar.gz | |
Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'
* commit '7bc780cd4413f688d3b834037b0f9ddfd6948140':
pixfmt: add a CUDA hwaccelled format
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index b14c963325..981fa0e16a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1978,6 +1978,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, + }, [AV_PIX_FMT_AYUV64LE] = { .name = "ayuv64le", .nb_components = 4, |