Merge commit '077011b5af2b3150efc52a9b58f5ef9bb0235087'

* commit '077011b5af2b3150efc52a9b58f5ef9bb0235087':
  qsv: Expose idr_interval for hevc as well

Also includes 98afe3fb71afd4a18009924aaba56bc577bbd400.

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

diff --cc libavcodec/qsvenc_hevc.c
index a8b293e19cf41fa328cee6bfff584691fda0efd6,fb65d58c32cac31136e3349548946b79743957ba..f132a26c1ad8948608dae879f529a43d835d90cb
--- 1/libavcodec/qsvenc_hevc.c
--- 2/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@@ -186,6 -181,6 +186,9 @@@ static av_cold int qsv_enc_init(AVCodec
          }
      }
  
++    // HEVC and H264 meaning of the value is shifted by 1, make it consistent
++    q->qsv.idr_interval++;
++
      ret = ff_qsv_enc_init(avctx, &q->qsv);
      if (ret < 0)
          return ret;
@@@ -225,6 -220,7 +228,8 @@@ static av_cold int qsv_enc_close(AVCode
  static const AVOption options[] = {
      QSV_COMMON_OPTS
  
 -    { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
++    { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT_MAX, VE, "idr_interval" },
++    { "begin_only", "Output an IDR-frame only at the beginning of the stream", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "idr_interval" },
      { "load_plugin", "A user plugin to load in an internal session", OFFSET(load_plugin), AV_OPT_TYPE_INT, { .i64 = LOAD_PLUGIN_DEFAULT }, LOAD_PLUGIN_NONE, LOAD_PLUGIN_HEVC_HW, VE, "load_plugin" },
      { "none",     NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_NONE },    0, 0, VE, "load_plugin" },
      { "hevc_sw",  NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_HEVC_SW }, 0, 0, VE, "load_plugin" },