[FFmpeg-cvslog] Merge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr 17 10:28:54 2017 +0200| [cc8cafae8775496a5a62285ad828db2d7fc1e7d8] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc8cafae8775496a5a62285ad828db2d7fc1e7d8
---