Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'

* commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c':
  qsv{dec,enc}: always use an internal mfxFrameSurface1

Minor fixups for differences in the QSV encoder because of a53cc.

Merged-by: Mark Thompson <sw@jkqxz.net>

diff --cc libavcodec/qsv_internal.h
index 6ccb72a2362e60325b2feac058d8e35c139a38c3,5b015a619d7eef1e997b9bb783a64ed185b85ec3..b1567fbef8341a3c0cf38037c5a07a80a7f33bda
--- 1/libavcodec/qsv_internal.h
--- 2/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@@ -40,12 -38,10 +40,11 @@@
  
  typedef struct QSVFrame {
      AVFrame *frame;
-     mfxFrameSurface1 *surface;
+     mfxFrameSurface1 surface;
 +    mfxEncodeCtrl enc_ctrl;
  
-     mfxFrameSurface1 surface_internal;
- 
      int queued;
+     int used;
  
      struct QSVFrame *next;
  } QSVFrame;

diff --cc libavcodec/qsvdec.c
Simple merge

diff --cc libavcodec/qsvenc.c
index 2e591507a2cf5a30730c7bfa6bf2b04e73c81955,3d99e846e3b2ed94bd55155f57290370874e4e2e..496a032f319c74320d96c28c952d69922ef3220b
--- 1/libavcodec/qsvenc.c
--- 2/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@@ -814,10 -813,9 +814,10 @@@ static void clear_unused_frames(QSVEncC
  {
      QSVFrame *cur = q->work_frames;
      while (cur) {
-         if (cur->surface && !cur->surface->Data.Locked) {
-             cur->surface = NULL;
+         if (cur->used && !cur->surface.Data.Locked) {
 +            free_encoder_ctrl_payloads(&cur->enc_ctrl);
              av_frame_unref(cur->frame);
+             cur->used = 0;
          }
          cur = cur->next;
      }
@@@ -907,22 -902,20 +909,20 @@@ static int submit_frame(QSVEncContext *
              frame->top_field_first   ? MFX_PICSTRUCT_FIELD_TFF :
                                         MFX_PICSTRUCT_FIELD_BFF;
          if (frame->repeat_pict == 1)
-             qf->surface_internal.Info.PicStruct |= MFX_PICSTRUCT_FIELD_REPEATED;
+             qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FIELD_REPEATED;
          else if (frame->repeat_pict == 2)
-             qf->surface_internal.Info.PicStruct |= MFX_PICSTRUCT_FRAME_DOUBLING;
+             qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_DOUBLING;
          else if (frame->repeat_pict == 4)
-             qf->surface_internal.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING;
+             qf->surface.Info.PicStruct |= MFX_PICSTRUCT_FRAME_TRIPLING;
  
-         qf->surface_internal.Data.PitchLow  = qf->frame->linesize[0];
-         qf->surface_internal.Data.Y         = qf->frame->data[0];
-         qf->surface_internal.Data.UV        = qf->frame->data[1];
- 
-         qf->surface = &qf->surface_internal;
+         qf->surface.Data.PitchLow  = qf->frame->linesize[0];
+         qf->surface.Data.Y         = qf->frame->data[0];
+         qf->surface.Data.UV        = qf->frame->data[1];
      }
  
-     qf->surface->Data.TimeStamp = av_rescale_q(frame->pts, q->avctx->time_base, (AVRational){1, 90000});
+     qf->surface.Data.TimeStamp = av_rescale_q(frame->pts, q->avctx->time_base, (AVRational){1, 90000});
  
 -    *surface = &qf->surface;
 +    *new_frame = qf;
  
      return 0;
  }
@@@ -958,10 -949,6 +958,10 @@@ static int encode_frame(AVCodecContext 
              return ret;
          }
      }
-         surf = qsv_frame->surface;
 +    if (qsv_frame) {
++        surf = &qsv_frame->surface;
 +        enc_ctrl = &qsv_frame->enc_ctrl;
 +    }
  
      ret = av_new_packet(&new_pkt, q->packet_size);
      if (ret < 0) {