diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-04 11:31:43 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-04 11:31:43 +0100 |
| commit | 9507f68deb664c19aceddcf1451f7237aae919c3 (patch) | |
| tree | 575564d03d2b00db333e42b7a4caa3375078302f | |
| parent | ad53c94d8fe0c45c5b3807ea11428dcb01c66757 (diff) | |
| parent | 3b6473b43eb69fc3faaf69f7fd0b83b51db7607f (diff) | |
| download | ffmpeg-9507f68deb664c19aceddcf1451f7237aae919c3.tar.gz | |
Merge commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f'
* commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f':
qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/qsvdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index c451fb9614..9125700e8a 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -416,7 +416,9 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q, av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); out_frame->queued = 0; - MFXVideoCORE_SyncOperation(q->session, sync, 60000); + do { + ret = MFXVideoCORE_SyncOperation(q->session, sync, 1000); + } while (ret == MFX_WRN_IN_EXECUTION); src_frame = out_frame->frame; |