Merge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:09:34 +0000 (14:09 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 12:09:34 +0000 (14:09 +0200)
commit86b2c7d422fab1afe1e3c9b3a5fd5d56ad1f3b1d
treed8153bc6faa8472878362c8b35910be5fe42893d
parent0ab40e4477eae94b074d62007d89f67a54ab25a7
parentac3c3ee678e51b05a2a7c30ce79465db46ba01fa
Merge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'

* commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa':
  dxva2: allow an empty array of ID3D11VideoDecoderOutputView

This commit is a noop, see 8fb48659018f17827c2d5a3ba72263f421fdfa2d

Merged-by: Clément Bœsch <cboesch@gopro.com>