Merge commit 'c3f113d58488df7594a489bdbb993a69ad47063c'

[ffmpeg] / libavcodec / qsvenc.c

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 7445d5b1220e304144d34df62de8e86658ab309a..ac443c1a26541dd44884fda95036f9ecaceabd5c 100644 (file)
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -982,7 +982,7 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
         ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync);
         if (ret == MFX_WRN_DEVICE_BUSY)
             av_usleep(500);
-    } while (ret > 0);
+    } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION);
 
     if (ret < 0) {
         av_packet_unref(&new_pkt);