diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 08:43:03 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-19 08:43:03 +0100 |
| commit | b5513441e477f63e9627ce6eb7c4cad475a4ba35 (patch) | |
| tree | 36c7c1f6143cc0d4961207c6a6f8d43926478a9b | |
| parent | 7dae3461c0bbd15e0765f29c33d2eb40566b9562 (diff) | |
| parent | a6259a6ecbad18d58085e4ab23f56151e98d7b53 (diff) | |
| download | ffmpeg-b5513441e477f63e9627ce6eb7c4cad475a4ba35.tar.gz | |
Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'
* commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53':
qsvenc: properly handle the warning from MFXVideoCORE_SyncOperation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/qsvenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 04b8e200cd..28a01398a5 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -989,7 +989,9 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); av_fifo_generic_read(q->async_fifo, &bs, sizeof(bs), NULL); - MFXVideoCORE_SyncOperation(q->session, sync, 60000); + do { + ret = MFXVideoCORE_SyncOperation(q->session, sync, 1000); + } while (ret == MFX_WRN_IN_EXECUTION); new_pkt.dts = av_rescale_q(bs->DecodeTimeStamp, (AVRational){1, 90000}, avctx->time_base); new_pkt.pts = av_rescale_q(bs->TimeStamp, (AVRational){1, 90000}, avctx->time_base); |