Merge commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:10:25 +0000 (14:10 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:10:25 +0000 (14:10 +0200)
commit49a25d02ddf68e4cb90726feb57a5df4487ee6ec
tree3d7393b84c429b8c8303fa4eb6f44a9afa753f0d
parent4554178f072ea1fad054381ba5ce3b48b5cf9280
parent83847cc8fa97e0fc637a0962bafb837acdb6eacc
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>
libavcodec/qsvenc.c