Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:32:29 +0000 (13:32 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:32:29 +0000 (13:32 +0200)
* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
  vaapi_encode: Fix GOP sizing

This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93

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

Trivial merge