Merge commit 'da917fcf5183ed249ad1285b8edd330f421376c4'
authorClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:06:49 +0000 (17:06 +0100)
committerClément Bœsch <cboesch@gopro.com>
Tue, 31 Jan 2017 16:06:49 +0000 (17:06 +0100)
* commit 'da917fcf5183ed249ad1285b8edd330f421376c4':
  avconv_dxva2: add a profile check for hevc

This commit is a noop, see a655bc834479024ff4d60d0b8ecca290e73eb96c

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

Trivial merge