Merge commit 'a1335149fd610b16459d9281b611282cac51c950'

* commit 'a1335149fd610b16459d9281b611282cac51c950':
  qsvenc: store the sync point in heap memory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavcodec/qsvenc.c
index be54bf9a149d0b403d1557821d8d7a73c1dec301,473a1804eb79483b0e0069392aa9f3a91c19fb0d..132cf47bb2c886924fb572f5bc96556df31c14f0
--- 1/libavcodec/qsvenc.c
--- 2/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@@ -926,9 -876,7 +926,9 @@@ static int encode_frame(AVCodecContext 
      mfxBitstream *bs;
  
      mfxFrameSurface1 *surf = NULL;
-     mfxSyncPoint sync      = NULL;
 -    mfxSyncPoint *sync     = NULL;
++    mfxSyncPoint *sync      = NULL;
 +    QSVFrame *qsv_frame = NULL;
 +    mfxEncodeCtrl* enc_ctrl = NULL;
      int ret;
  
      if (frame) {
@@@ -957,18 -901,18 +957,25 @@@
      bs->Data      = new_pkt.data;
      bs->MaxLength = new_pkt.size;
  
 +    if (q->set_encode_ctrl_cb) {
 +        q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl);
 +    }
 +
+     sync = av_mallocz(sizeof(*sync));
+     if (!sync) {
+         av_freep(&bs);
+         av_packet_unref(&new_pkt);
+         return AVERROR(ENOMEM);
+     }
+ 
      do {
-         ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, &sync);
 -        ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, sync);
 -        if (ret == MFX_WRN_DEVICE_BUSY)
 -            av_usleep(1);
 -    } while (ret > 0);
++        ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync);
 +        if (ret == MFX_WRN_DEVICE_BUSY) {
 +            av_usleep(500);
 +            continue;
 +        }
 +        break;
 +    } while ( 1 );
  
      if (ret < 0) {
          av_packet_unref(&new_pkt);