1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7'

* commit '5a6707e49b7710f48d658b2f2591b9a6337fb9b7':
  cbs_mpeg2: Fix marker_bit type
  cbs: Add padding to slice data allocations

This commit is a noop, see
b4c915f4b3
5b2c71bb94

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-12-10 20:49:50 -03:00
commit f750a0bcfe

Diff Content Not Available