Merge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:40:42 +0000 (10:40 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:40:42 +0000 (10:40 +0200)
commit730f75a099f82d21855442a76a699b36acb89bbb
tree66491c83a412fafb161cbe74778a6cdc7ff4980e
parent7b1929f173e9f41d8a5d370a2db0dcf004d623fa
parent9b1db2d33883c6ff3f8c7b2453146501ba14ca20
Merge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'

* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
  vaapi_h264: Fix POC on IDR frames

This commit is a noop, see e72662e131e5099e34d5a7519c5690d2fff7b83f

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