Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'

* commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2': qsvdec: close the MFX decoder on uninit Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · 9457a11a22
parent 029aa8ff14 2c32eace5e
commit 9457a11a22
1 changed files with 2 additions and 1 deletions
--- 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) {