diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:23:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-19 20:23:48 +0100 |
| commit | e3755119fae71c9e34b630679c2805fcf1c97e2c (patch) | |
| tree | 59f417c9cbac3e3c8028be8a950435018de2c4ec /libavutil/pixdesc.c | |
| parent | 65da611d3415dd859d92c00d59fecbb5bba68692 (diff) | |
| parent | 5b1d9ceec715846a58fe029bc3889ed6fa62436a (diff) | |
Merge commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a'
* commit '5b1d9ceec715846a58fe029bc3889ed6fa62436a':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 d52e9b672b..41bbe5d236 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1900,6 +1900,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "vda", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_QSV] = { + .name = "qsv", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, }; static const char *color_range_names[AVCOL_RANGE_NB] = { |