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 | |
| 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>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/pixdesc.c | 4 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 6 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index e8ea0129ea..cbdfc9bc03 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2014-08-09 API changes, most recent first: +2015-xx-xx - xxxxxxx - lavu 54.9.0 + Add AV_PIX_FMT_QSV for QSV hardware acceleration. + 2015-02-xx - xxxxxxx - lavc 56.21.102 Deprecate VIMA decoder. 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] = { 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 diff --git a/libavutil/version.h b/libavutil/version.h index 73bf398dff..355eef344c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 18 +#define LIBAVUTIL_VERSION_MINOR 19 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |