]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:47:13 +0000 (11:47 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:47:13 +0000 (11:47 +0100)
* commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa':
  d3d11va: Use the proper decoding slice index

This commit is a noop, see 9b462a0b9df6260f59726c98d8aef8b07a1e442b

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge