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

Trivial merge