Merge commit '92736c74fb1633e36f7134a880422a9b7db14d3f'

* commit '92736c74fb1633e36f7134a880422a9b7db14d3f':
  qsvdec: add support for P010 (10-bit 420) decoding

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

diff --cc libavcodec/qsv.c
Simple merge

diff --cc libavcodec/qsvdec.c
index e1663365488e254d4d2e0753248332375b458440,929b9af4266ede9d64fbf6e098b333e3f5efd8f7..e71af599b1ca0d3899d08d7ac06c9ae8d6b94235
--- 1/libavcodec/qsvdec.c
--- 2/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@@ -133,12 -139,12 +139,12 @@@ static int qsv_decode_init(AVCodecConte
          return ret;
  
      param.mfx.CodecId      = ret;
 -    param.mfx.CodecProfile = avctx->profile;
 -    param.mfx.CodecLevel   = avctx->level;
 +    param.mfx.CodecProfile = ff_qsv_profile_to_mfx(avctx->codec_id, avctx->profile);
 +    param.mfx.CodecLevel   = avctx->level == FF_LEVEL_UNKNOWN ? MFX_LEVEL_UNKNOWN : avctx->level;
  
-     param.mfx.FrameInfo.BitDepthLuma   = 8;
-     param.mfx.FrameInfo.BitDepthChroma = 8;
-     param.mfx.FrameInfo.Shift          = 0;
+     param.mfx.FrameInfo.BitDepthLuma   = desc->comp[0].depth;
+     param.mfx.FrameInfo.BitDepthChroma = desc->comp[0].depth;
+     param.mfx.FrameInfo.Shift          = desc->comp[0].depth > 8;
      param.mfx.FrameInfo.FourCC         = q->fourcc;
      param.mfx.FrameInfo.Width          = avctx->coded_width;
      param.mfx.FrameInfo.Height         = avctx->coded_height;

diff --cc libavcodec/qsvdec_h2645.c
index 94fbd07fb9bcc86c56fc09c5e235a9fdee6957cf,a26f1505e53992fb8388af0185dbdeb23d20ddc4..aa7aded4ff69ddbc846cfbb7c834926d08c6a14a
--- 1/libavcodec/qsvdec_h2645.c
--- 2/libavcodec/qsvdec_h2645.c
+++ b/libavcodec/qsvdec_h2645.c
@@@ -266,9 -266,10 +266,10 @@@ AVCodec ff_hevc_qsv_decoder = 
      .decode         = qsv_decode_frame,
      .flush          = qsv_decode_flush,
      .close          = qsv_decode_close,
 -    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
 +    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING,
      .priv_class     = &hevc_class,
      .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
+                                                     AV_PIX_FMT_P010,
                                                      AV_PIX_FMT_QSV,
                                                      AV_PIX_FMT_NONE },
  };
@@@ -304,9 -305,10 +305,10 @@@ AVCodec ff_h264_qsv_decoder = 
      .decode         = qsv_decode_frame,
      .flush          = qsv_decode_flush,
      .close          = qsv_decode_close,
 -    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
 +    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING,
      .priv_class     = &class,
      .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12,
+                                                     AV_PIX_FMT_P010,
                                                      AV_PIX_FMT_QSV,
                                                      AV_PIX_FMT_NONE },
  };