[FFmpeg-cvslog] Merge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:16:11 2017 +0100| [553d8a9ecf16d10a786b9b8687b6d0a080fa53f8] | committer: Clément Bœsch

Merge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'

* commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3':
  vaapi_h265: Fix buffering parameters
  vaapi_h265: Fix slice header writing
  vaapi_h264: Write bitstream restriction fields
  vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  vaapi_encode: Decide on GOP setup before initialising sequence parameters

This merge is a noop, see:
  30ebabca7c vaapi_h265: Fix buffering parameters
  ae0230cc3e vaapi_h265: Fix slice header writing
  6796e6ea84 vaapi_h264: Write bitstream restriction fields
  658c5afaa0 vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  ded1859df1 vaapi_encode: Decide on GOP setup before initialising sequence parameters

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

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