Merge commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8'

* commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8':
  qsvenc: add the Access Unit Delimiter NAL Unit support

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

diff --cc libavcodec/qsvenc.c
Simple merge

diff --cc libavcodec/qsvenc.h
Simple merge

diff --cc libavcodec/qsvenc_h264.c
index e01a2a3369305ea3f439c2b2f81d4ba50dde5bd6,634a7d3f9199b68e009e78b138dded7f9fd734e2..0fe29c27300a06629f17f3c0b07a014b4c8d5ec2
--- 1/libavcodec/qsvenc_h264.c
--- 2/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@@ -141,7 -91,8 +141,10 @@@ 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},
+ 
      { NULL },
  };