diff options
| author | Zhong Li <zhong.li@intel.com> | 2019-03-08 14:41:22 +0800 |
|---|---|---|
| committer | Zhong Li <zhong.li@intel.com> | 2019-03-18 07:06:41 +0800 |
| commit | 15d016be30bd24cdba514c7c888e9da0286b5647 (patch) | |
| tree | 3a6b95def981d789e11a1bb8c21a539d881bbef4 /libavutil | |
| parent | 14eea7c47a9275dbef0168ee5e13424d1fd58357 (diff) | |
| download | ffmpeg-15d016be30bd24cdba514c7c888e9da0286b5647.tar.gz | |
lavu/qsv: allow surface size larger than requirement
Just like commit 6829a079444e10818a847e153121fb458cc5c0a8,
surface size larger than requirement should not be treated as error.
Signed-off-by: Zhong Li <zhong.li@intel.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext_qsv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 814ce215ce..b6d8bfe2bf 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -389,7 +389,7 @@ static mfxStatus frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req, !(req->Type & (MFX_MEMTYPE_FROM_VPPIN | MFX_MEMTYPE_FROM_VPPOUT)) || !(req->Type & MFX_MEMTYPE_EXTERNAL_FRAME)) return MFX_ERR_UNSUPPORTED; - 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, AV_LOG_ERROR, "Mismatching surface properties in an " "allocation request: %dx%d %d %d vs %dx%d %d %d\n", |