[FFmpeg-cvslog] Merge commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:47:13 2017 +0100| [3e40c9560a57e5e7beb1870090a4d238286203e1] | committer: Clément Bœsch

Merge commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa'

* commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa':
  d3d11va: Use the proper decoding slice index

This commit is a noop, see 9b462a0b9df6260f59726c98d8aef8b07a1e442b

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e40c9560a57e5e7beb1870090a4d238286203e1
---