[FFmpeg-cvslog] Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Fri May  5 13:32:29 2017 +0200| [5786ee3eee7a88bf9faecc7246b35cfa64b31236] | committer: Clément Bœsch

Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'

* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
  vaapi_encode: Fix GOP sizing

This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93

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

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