Merge commit '325aa63dd1a3abc2453914d0bc111d297833d725'

* commit '325aa63dd1a3abc2453914d0bc111d297833d725':
  qsv: enforcing continuous memory layout

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

diff --cc libavcodec/qsvenc.c
index c4cdebf,c74b3ae..a866454
--- 1/libavcodec/qsvenc.c
--- 2/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@@ -1011,8 -1014,6 +1011,7 @@@ static void clear_unused_frames(QSVEncC
      QSVFrame *cur = q->work_frames;
      while (cur) {
          if (cur->used && !cur->surface.Data.Locked) {
-             av_frame_unref(cur->frame);
 +            free_encoder_ctrl_payloads(&cur->enc_ctrl);
              cur->used = 0;
          }
          cur = cur->next;