diff options
| author | James Almer <jamrial@gmail.com> | 2018-02-11 22:44:12 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-02-11 22:44:12 -0300 |
| commit | 87faeb1e685eedc49d9cb6de14bab1cfc88ab655 (patch) | |
| tree | 13f943fe2c1212e27d3bdac766c19d9b7cf39fee | |
| parent | b7d476b1384fe0e4a2c4d424d880d9c4f0b6f7ca (diff) | |
| parent | 6829a079444e10818a847e153121fb458cc5c0a8 (diff) | |
| download | ffmpeg-87faeb1e685eedc49d9cb6de14bab1cfc88ab655.tar.gz | |
Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'
* commit '6829a079444e10818a847e153121fb458cc5c0a8':
qsvdec: Relax the surface vs coded dimension check
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/qsv.c | 2 | ||||
| -rw-r--r-- | libavcodec/qsvdec.c | 3 |
2 files changed, 1 insertions, 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) |