[FFmpeg-cvslog] Merge commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 16:42:50 2017 +0100| [9a0f91314adca49f259eb7e36ccf4e5cea31f62c] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9a0f91314adca49f259eb7e36ccf4e5cea31f62c
---