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/pixfmt.h | |
| parent | 65da611d3415dd859d92c00d59fecbb5bba68692 (diff) | |
| parent | 5b1d9ceec715846a58fe029bc3889ed6fa62436a (diff) | |
| download | ffmpeg-e3755119fae71c9e34b630679c2805fcf1c97e2c.tar.gz | |
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/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 73d4cc987a..e6270ef692 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -247,7 +247,11 @@ enum AVPixelFormat { AV_PIX_FMT_GBRAP_LIBAV, ///< planar GBRA 4:4:4:4 32bpp AV_PIX_FMT_GBRAP16BE_LIBAV, ///< planar GBRA 4:4:4:4 64bpp, big-endian AV_PIX_FMT_GBRAP16LE_LIBAV, ///< planar GBRA 4:4:4:4 64bpp, little-endian - + /** + * HW acceleration through QSV, data[3] contains a pointer to the + * mfxFrameSurface1 structure. + */ + AV_PIX_FMT_QSV, #ifndef AV_PIX_FMT_ABI_GIT_MASTER AV_PIX_FMT_RGBA64BE=0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian |