Merge commit '21962261'

* commit '21962261': qsv: handle the semi-packed formats in map_fourcc as well Merged-by: Mark Thompson <sw@jkqxz.net>

Merge commit '21962261'
* commit '21962261': qsv: handle the semi-packed formats in map_fourcc as well Merged-by: Mark Thompson <sw@jkqxz.net>
210dd7bb · Mark Thompson · 5e193daa · 21962261 · 210dd7bb
Commit 210dd7bb authored Mar 12, 2017 by Mark Thompson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

qsv.c libavcodec/qsv.c +2 -0

No files found.
--- 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: