[FFmpeg-cvslog] Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'
James Almer
git at videolan.org
Mon Feb 12 03:46:20 EET 2018
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Feb 11 22:44:12 2018 -0300| [87faeb1e685eedc49d9cb6de14bab1cfc88ab655] | committer: James Almer
Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'
* commit '6829a079444e10818a847e153121fb458cc5c0a8':
qsvdec: Relax the surface vs coded dimension check
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87faeb1e685eedc49d9cb6de14bab1cfc88ab655
---
libavcodec/qsv.c | 2 +-
libavcodec/qsvdec.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 250b4e61e3..5217adfa9d 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -389,7 +389,7 @@ static mfxStatus qsv_frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
mfxFrameInfo *i = &req->Info;
mfxFrameInfo *i1 = &frames_hwctx->surfaces[0].Info;
- if (i->Width != i1->Width || i->Height != i1->Height ||
+ if (i->Width > i1->Width || i->Height > i1->Height ||
i->FourCC != i1->FourCC || i->ChromaFormat != i1->ChromaFormat) {
av_log(ctx->logctx, AV_LOG_ERROR, "Mismatching surface properties in an "
"allocation request: %dx%d %d %d vs %dx%d %d %d\n",
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index abbede5d97..45bedf9a7b 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -149,9 +149,6 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
else if (frames_hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET)
iopattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
}
-
- frame_width = frames_hwctx->surfaces[0].Info.Width;
- frame_height = frames_hwctx->surfaces[0].Info.Height;
}
if (!iopattern)
======================================================================
More information about the ffmpeg-cvslog
mailing list