diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:17:09 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:17:09 +0200 |
| commit | 9457a11a220c406ce3576ea78ca28c251c3240cf (patch) | |
| tree | 78aee0aafe58431cf608ead42fbcca0ef08b9f7a | |
| parent | 029aa8ff140784405533cd4be5051f8733dc5acb (diff) | |
| parent | 2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2 (diff) | |
| download | ffmpeg-streaming-9457a11a220c406ce3576ea78ca28c251c3240cf.zip ffmpeg-streaming-9457a11a220c406ce3576ea78ca28c251c3240cf.tar.gz | |
Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'
* commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2':
qsvdec: close the MFX decoder on uninit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/qsvdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 00990ba..84caec2 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) { |
