[FFmpeg-cvslog] Merge commit 'd20c118975220a0256027d1c2410bade94b8534d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Nov 14 15:18:49 2016 +0100| [e122a725fbe9bc5c1bb6047d6be8e0f504d660b9] | committer: Hendrik Leppkes

Merge commit 'd20c118975220a0256027d1c2410bade94b8534d'

* commit 'd20c118975220a0256027d1c2410bade94b8534d':
  hwcontext_qsv: add support for p010

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e122a725fbe9bc5c1bb6047d6be8e0f504d660b9
---

 libavutil/hwcontext_qsv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
index 13be5b0..03244a6 100644
--- a/libavutil/hwcontext_qsv.c
+++ b/libavutil/hwcontext_qsv.c
@@ -90,6 +90,7 @@ static const struct {
     uint32_t           fourcc;
 } supported_pixel_formats[] = {
     { AV_PIX_FMT_NV12, MFX_FOURCC_NV12 },
+    { AV_PIX_FMT_P010, MFX_FOURCC_P010 },
 };
 
 static int qsv_device_init(AVHWDeviceContext *ctx)


======================================================================