Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:33:24 +0000 (13:33 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:33:24 +0000 (13:33 +0200)
commit2eb8fcff0f998e20e5b3e67eb9de4d805eb71380
treef3f7d2588cdeeb85937aedeb00b6c03fc1c33817
parent5786ee3eee7a88bf9faecc7246b35cfa64b31236
parenta3c3a5eac20a51d402c332cdf5220fff40a7943f
Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'

* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f':
  vaapi_encode: Support forcing IDR frames via AVFrame.pict_type

This commit is a noop, see c667c0979cbc2e04d1d00964b82ac49746caa43c

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