Merge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 08:28:54 +0000 (10:28 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 08:28:54 +0000 (10:28 +0200)
commitcc8cafae8775496a5a62285ad828db2d7fc1e7d8
treef91abbb83808d3f37f8d85a9dcf65af399386c23
parent9142b04bba45c27a69ac8baec088357070614674
parent7d81698b89172d2dcf1b78d4b42ba86262360559
Merge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'

* commit '7d81698b89172d2dcf1b78d4b42ba86262360559':
  vaapi_h265: Fix CFR mode with framerate set in AVCodecContext

This commit is a noop, see 37de9ce713ebb65d8b040f4f83ba7542f0754485

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