pixfmt: add a pixel format for QSV hwaccel

diff --git a/doc/APIchanges b/doc/APIchanges
index 0c6e275534461d3e6c122e95e508160f0205c37c..18e8d5e46ca76b497778c7913bd0b17780f98205 100644 (file)
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,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-01-27 - 728685f - lavc 56.12.0, lavu 54.8.0 - avcodec.h, frame.h
   Add AV_PKT_DATA_AUDIO_SERVICE_TYPE and AV_FRAME_DATA_AUDIO_SERVICE_TYPE for
   storing the audio service type as side data.

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index a9ccfbe8e6f0f300c848a4b507b14c393f0f2030..bd72c048f3dfd7fdfc75fcecd282c0894cde1719 100644 (file)
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1560,6 +1560,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 e50742515012af2cf1c7f2592133c5923551f277..47635838686b9bd35a1632a2f829f243318c9cc6 100644 (file)
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -209,6 +209,11 @@ enum AVPixelFormat {
     AV_PIX_FMT_GBRAP,        ///< planar GBRA 4:4:4:4 32bpp
     AV_PIX_FMT_GBRAP16BE,    ///< planar GBRA 4:4:4:4 64bpp, big-endian
     AV_PIX_FMT_GBRAP16LE,    ///< 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,
 
     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
 

diff --git a/libavutil/version.h b/libavutil/version.h
index 7a7d05407712f4f9a771db9e58bbf2f6bc9ee83d..77595a8e54daa0ac9fe9e5f8149267f51ea0fd5c 100644 (file)
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 54
-#define LIBAVUTIL_VERSION_MINOR  8
+#define LIBAVUTIL_VERSION_MINOR  9
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \