Merge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:26:39 +0000 (11:26 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 09:26:39 +0000 (11:26 +0200)
commit938e5f57d208a8a9a3978d6f92ed2139004b7b01
tree7514c7f8221c9b1e838aef408f4978d0211f0c0c
parentd168fe14e949b100f9552198339502331405d8ad
parent2835e9a9fd2b355e7936d1024ff1bf5fe454e428
Merge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'

* commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428':
  hevcdec: add P010 support for D3D11VA

This commit is a noop, see ccb94789e2968329947f1c2e00d019f387f9c409

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