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)
* 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>

Trivial merge