Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'

* commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4':
  qsvenc: print warnings from encode/init

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

diff --cc libavcodec/qsv.c
Simple merge

diff --cc libavcodec/qsv_internal.h
index eb8e3a59864403b31817d7e0c532472a34d2e508,41f4c3ddf6048f7eb5ab549e73aaea16ab246739..6ccb72a2362e60325b2feac058d8e35c139a38c3
--- 1/libavcodec/qsv_internal.h
--- 2/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@@ -65,8 -62,10 +65,11 @@@ int ff_qsv_map_error(mfxStatus mfx_err
  int ff_qsv_print_error(void *log_ctx, mfxStatus err,
                         const char *error_string);
  
+ int ff_qsv_print_warning(void *log_ctx, mfxStatus err,
+                          const char *warning_string);
+ 
  int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id);
 +int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile);
  
  int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc);
  

diff --cc libavcodec/qsvenc.c
index a0ea9651613582b74523efde4637b0cf6cb1da89,ba07db6e99122d780b1ec8c77dd34ff42b21f76f..2e591507a2cf5a30730c7bfa6bf2b04e73c81955
--- 1/libavcodec/qsvenc.c
--- 2/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@@ -986,11 -972,14 +989,14 @@@ static int encode_frame(AVCodecContext 
      }
  
      do {
 -        ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, sync);
 +        ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync);
          if (ret == MFX_WRN_DEVICE_BUSY)
 -            av_usleep(1);
 +            av_usleep(500);
      } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);
  
+     if (ret > 0)
+         ff_qsv_print_warning(avctx, ret, "Warning during encoding");
+ 
      if (ret < 0) {
          av_packet_unref(&new_pkt);
          av_freep(&bs);