ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Fri May 5 14:11:51 2017 +0200| [3c085c1ba56dfa33742e3b764c5272aca515a23c] | committer: Clément Bœsch
Merge commit 'b68e353136db6f963212c457281d9716516cdc59' * commit 'b68e353136db6f963212c457281d9716516cdc59': qsvdec: do not sync PIX_FMT_QSV surfaces Merged-by: Clément Bœsch <cboe...@gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c085c1ba56dfa33742e3b764c5272aca515a23c --- libavcodec/qsvdec.c | 8 +++++--- 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, \ ====================================================================== diff --cc libavcodec/version.h index a2def3f26b,106543de53..969f985895 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@@ -27,9 -27,9 +27,9 @@@ #include "libavutil/version.h" -#define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 30 -#define LIBAVCODEC_VERSION_MICRO 4 +#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, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
