[FFmpeg-cvslog] Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sun Mar 12 14:21:37 2017 +0000| [210dd7bbb2c0e4013fd8519d3b20e3032f0beb18] | committer: Mark Thompson

Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'

* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d':
  qsv: handle the semi-packed formats in map_fourcc as well

Merged-by: Mark Thompson <sw at jkqxz.net>

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

 libavcodec/qsv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index aac6ce6..028a496 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -110,9 +110,11 @@ int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
     switch (format) {
     case AV_PIX_FMT_YUV420P:
     case AV_PIX_FMT_YUVJ420P:
+    case AV_PIX_FMT_NV12:
         *fourcc = MFX_FOURCC_NV12;
         return AV_PIX_FMT_NV12;
     case AV_PIX_FMT_YUV420P10:
+    case AV_PIX_FMT_P010:
         *fourcc = MFX_FOURCC_P010;
         return AV_PIX_FMT_P010;
     default:


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