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)
commitdc0ca508ea2521010ac6168e330b0339edfc518c
treef5131239425252ca53b21f4f4efd7929ab7326f2
parent7c300a8ed4ef093a1dea40dd4d524cb32cef5c08
parentda917fcf5183ed249ad1285b8edd330f421376c4
Merge commit 'da917fcf5183ed249ad1285b8edd330f421376c4'

* 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>