Merge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 13:49:26 +0000 (15:49 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 22 Oct 2015 13:49:26 +0000 (15:49 +0200)
commita440886a35e3329830d0c96311a80bd0f08ef6f3
tree7d0c316860bd05a9709ab64c6cb1a2159ec93f74
parent2fece1e4d5ee180576617eeb41ba4615c2e97729
parent2ec96b6bd5bf7b22978711bcf2cee702bee89c6f
Merge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'

* commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f':
  qsvenc: cosmetics, reindent

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qsvenc.c