Merge commit '7157d959264f3729da463725c6faa580d9394d19'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:41:00 +0000 (22:41 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:41:00 +0000 (22:41 +0000)
commitab6edb173b365d9a787c2df3a45e3a018d7843d7
treebe0599167db492596c55418f0b2e841b50efab7d
parent7386b4ff39506b7a34b3689cc4b05993ed9b4a4f
parent7157d959264f3729da463725c6faa580d9394d19
Merge commit '7157d959264f3729da463725c6faa580d9394d19'

* commit '7157d959264f3729da463725c6faa580d9394d19':
  cbs_h264: Move slice_group_id array out of PPS structure

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/cbs_h264.h
libavcodec/cbs_h2645.c
libavcodec/cbs_h264_syntax_template.c