Merge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:34:03 +0000 (13:34 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 11:34:03 +0000 (13:34 +0200)
commit2ea6310f4ae7509d7711fdb7cf86e80c189afa8b
treef3f7d2588cdeeb85937aedeb00b6c03fc1c33817
parent2eb8fcff0f998e20e5b3e67eb9de4d805eb71380
parent89725a8512721fffd190021ded2d3f5b42e20e2a
Merge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'

* commit '89725a8512721fffd190021ded2d3f5b42e20e2a':
  vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames

This commit is a noop, see eefa4b76ee5a1059a36d8bd77b123c2cfbfea604

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