Merge commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7'
authorJames Almer <jamrial@gmail.com>
Sun, 10 Dec 2017 23:49:50 +0000 (20:49 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 10 Dec 2017 23:49:50 +0000 (20:49 -0300)
* commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7':
  cbs_mpeg2: Fix marker_bit type
  cbs: Add padding to slice data allocations

This commit is a noop, see
b4c915f4b3e15c3e787e319b961e4389762f6309
5b2c71bb94d7cab23ee81b5c29388f5fadbcaf22

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

Trivial merge