Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'

* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d': qsv: handle the semi-packed formats in map_fourcc as well Merged-by: Mark Thompson <sw@jkqxz.net>
9 years ago · 210dd7bbb2
--- 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: