summaryrefslogtreecommitdiff
path: root/libavcodec/qsvdec.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-29 14:17:09 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-29 14:17:09 +0200
commit9457a11a220c406ce3576ea78ca28c251c3240cf (patch)
tree78aee0aafe58431cf608ead42fbcca0ef08b9f7a /libavcodec/qsvdec.c
parent029aa8ff140784405533cd4be5051f8733dc5acb (diff)
parent2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2 (diff)
Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'
* commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2': qsvdec: close the MFX decoder on uninit Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsvdec.c')
-rw-r--r--libavcodec/qsvdec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 00990badb1..84caec290e 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -293,7 +293,8 @@ static void close_decoder(QSVContext *q)
{
QSVFrame *cur;
- MFXVideoDECODE_Close(q->session);
+ if (q->session)
+ MFXVideoDECODE_Close(q->session);
cur = q->work_frames;
while (cur) {