Merge commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:19:06 +0000 (13:19 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:19:06 +0000 (13:19 +0200)
commit40b2878ad3bb12d91b15a7278b6a8862c09f4d54
tree2c26ca1667225bda75e66dc6d6d1d04d30bf339f
parent6fc74934de1fcd82ace75dfff17605ec41c7e90d
parent8c3c7b8920033d61c7aa15a4465b759c84e5958f
Merge commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f'

* commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f':
  dxva2_h264: Remove an unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>