Merge commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:42:50 +0000 (16:42 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:42:50 +0000 (16:42 +0100)
commit9a0f91314adca49f259eb7e36ccf4e5cea31f62c
treec817ae488e7a0e11089e4cf1dd3039906bc76b8f
parent6c3d2dad9e29464ad02a364035c0b1f531f12b1b
parent3a9662af6c741f8354b1ca97642f78f5c02e2e8f
Merge commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f'

* commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f':
  vaapi_h264: Fix HRD bit_rate/cpb_size scaling

This commit is a noop, see 06d73d002e7f911f26ae1548b46e442a6ece9a4a

Merged-by: Clément Bœsch <u@pkh.me>