Merge commit '10eb496d9ae94df6f792b0e1d8750738eb3a0952'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:08:24 +0000 (14:08 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:08:24 +0000 (14:08 -0300)
* commit '10eb496d9ae94df6f792b0e1d8750738eb3a0952':
  vaapi_mpeg2: Convert to use coded bitstream infrastructure
  mpeg12: Move finding the best frame rate to common code
  cbs_mpeg2: Add support for picture display extension
  cbs_h265: Fix ranges of prediction weight offsets
  cbs_h265: Fix reading of unknown parameter set extension data
  vaapi_h264: Fix CPB/DPB delays

This commit is a noop, see
94a4048619665e99a19d9e2961254dc9b5c736a7
9b0c7aa0e446eceec96ba8f4009e004fad29fba3
686e388bbb6aeef077095a83f84b53d143d44d63
278c308ceae6b8d7bac1dfc24518821aae603988
d8928ad6b6e899c409129c8e16b225c09a8a5abb

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge