mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'
* commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53': qsvenc: properly handle the warning from MFXVideoCORE_SyncOperation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
b5513441e4
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user