diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 14:11:51 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 14:11:51 +0200 |
| commit | 3c085c1ba56dfa33742e3b764c5272aca515a23c (patch) | |
| tree | 821896344f81c6ac046637429aba3fe91cbbd833 | |
| parent | 86b2c7d422fab1afe1e3c9b3a5fd5d56ad1f3b1d (diff) | |
| parent | b68e353136db6f963212c457281d9716516cdc59 (diff) | |
| download | ffmpeg-3c085c1ba56dfa33742e3b764c5272aca515a23c.tar.gz | |
Merge commit 'b68e353136db6f963212c457281d9716516cdc59'
* commit 'b68e353136db6f963212c457281d9716516cdc59':
qsvdec: do not sync PIX_FMT_QSV surfaces
Merged-by: Clément Bœsch <cboesch@gopro.com>
| -rw-r--r-- | libavcodec/qsvdec.c | 8 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 60a53f6b2a..d7664ce581 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -363,9 +363,11 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); out_frame->queued = 0; - do { - ret = MFXVideoCORE_SyncOperation(q->session, *sync, 1000); - } while (ret == MFX_WRN_IN_EXECUTION); + if (avctx->pix_fmt != AV_PIX_FMT_QSV) { + do { + ret = MFXVideoCORE_SyncOperation(q->session, *sync, 1000); + } while (ret == MFX_WRN_IN_EXECUTION); + } av_freep(&sync); diff --git a/libavcodec/version.h b/libavcodec/version.h index a2def3f26b..969f985895 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MINOR 94 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |