diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:10:25 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:10:25 +0200 |
| commit | 49a25d02ddf68e4cb90726feb57a5df4487ee6ec (patch) | |
| tree | 3d7393b84c429b8c8303fa4eb6f44a9afa753f0d /libavcodec/qsvenc.c | |
| parent | 4554178f072ea1fad054381ba5ce3b48b5cf9280 (diff) | |
| parent | 83847cc8fa97e0fc637a0962bafb837acdb6eacc (diff) | |
Merge commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc'
* commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc':
qsvenc: do not try to close the encoder if the session is NULL
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.c')
| -rw-r--r-- | libavcodec/qsvenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 1aeab03d04..1013fe15a8 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -537,7 +537,8 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) { QSVFrame *cur; - MFXVideoENCODE_Close(q->session); + if (q->session) + MFXVideoENCODE_Close(q->session); q->session = NULL; ff_qsv_close_internal_session(&q->internal_qs); |