[FFmpeg-cvslog] Merge commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Dec 10 20:49:50 2017 -0300| [f750a0bcfea9e54ee3adbd8616ab861d1471f9b8] | committer: James Almer

Merge commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7'

* 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 at gmail.com>

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