Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'

* commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42':
  qsv: adding Multi Frame Encode support

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/qsv.c
Simple merge

diff --cc libavcodec/qsv_internal.h
Simple merge

diff --cc libavcodec/qsvenc.c
Simple merge

diff --cc libavcodec/qsvenc.h
index 080f6f08d374a3eab37d00865eace8cdd5bb94b3,a7fc57bb48b851e2597c235a9d4a0736f6856609..d48272224c3b7cbc59d7daa26fd9bec3a57965ae
--- 1/libavcodec/qsvenc.h
--- 2/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@@ -157,9 -161,10 +162,13 @@@ typedef struct QSVEncContext 
      int int_ref_qp_delta;
      int recovery_point_sei;
  
 +    int a53_cc;
++
+ #if QSV_HAVE_MF
+     int mfmode;
+ #endif
      char *load_plugins;
 +    SetEncodeCtrlCB *set_encode_ctrl_cb;
  } QSVEncContext;
  
  int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);

diff --cc libavcodec/qsvenc_h264.c
index 0fe29c27300a06629f17f3c0b07a014b4c8d5ec2,ae00ff8d54650ac8e6fd5bab1e5e8e6fc163340b..718bf9cb2165808396963dcb57c248ce2600c0ab
--- 1/libavcodec/qsvenc_h264.c
--- 2/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@@ -141,10 -91,12 +141,14 @@@ static const AVOption options[] = 
      { "main"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_MAIN     }, INT_MIN, INT_MAX,     VE, "profile" },
      { "high"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_HIGH     }, INT_MIN, INT_MAX,     VE, "profile" },
  
 +    { "a53cc" , "Use A53 Closed Captions (if available)", OFFSET(qsv.a53_cc), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, VE},
 +
      { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE},
  
+ #if QSV_HAVE_MF
+     { "mfmode", "Multi-Frame Mode", OFFSET(qsv.mfmode), AV_OPT_TYPE_INT, { .i64 = MFX_MF_AUTO }, 0, INT_MAX, VE },
+ #endif
+ 
      { NULL },
  };
  

diff --cc libavfilter/qsvvpp.c
Simple merge

diff --cc libavfilter/qsvvpp.h
Simple merge

diff --cc libavfilter/vf_deinterlace_qsv.c
Simple merge

diff --cc libavfilter/vf_scale_qsv.c
Simple merge

diff --cc libavutil/hwcontext_qsv.c
Simple merge