summaryrefslogtreecommitdiff
path: root/libavcodec/qsv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-06-12 20:45:02 +0200
committerAnton Khirnov <anton@khirnov.net>2016-06-21 19:53:38 +0200
commitad9c9440d592e4d53d6bec9961b4b22e25387d70 (patch)
tree54781a2410d95a18c8ec01f1d9cb6fc7ddb76437 /libavcodec/qsv.c
parenta0524d9b1e1bb0012207584f067096df7792df6c (diff)
qsvenc: support getting the session from an AVHWFramesContext
Diffstat (limited to 'libavcodec/qsv.c')
-rw-r--r--libavcodec/qsv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 25147f206a..8596f0d94e 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -191,7 +191,7 @@ static mfxStatus qsv_frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
mfxFrameInfo *i1 = &ctx->info;
if (!(req->Type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET) ||
- !(req->Type & (MFX_MEMTYPE_FROM_DECODE)) ||
+ !(req->Type & (MFX_MEMTYPE_FROM_DECODE | MFX_MEMTYPE_FROM_ENCODE)) ||
!(req->Type & MFX_MEMTYPE_EXTERNAL_FRAME))
return MFX_ERR_UNSUPPORTED;
if (i->Width != i1->Width || i->Height != i1->Height ||