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)
commit5786ee3eee7a88bf9faecc7246b35cfa64b31236
treef3f7d2588cdeeb85937aedeb00b6c03fc1c33817
parent18e2a446c52b0a5cb520f9b68d8fd4171a5f6471
parent37fab0661a760b2a9d727939d72e629acee1a6ef
Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'

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

This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93

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