Commit b5513441 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'a6259a6e'

* commit 'a6259a6e':
  qsvenc: properly handle the warning from MFXVideoCORE_SyncOperation
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 7dae3461 a6259a6e
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment