Merge commit '7157d959264f3729da463725c6faa580d9394d19'

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

Merged-by: Mark Thompson <sw@jkqxz.net>

diff --cc libavcodec/cbs_h264.h
Simple merge

diff --cc libavcodec/cbs_h2645.c
Simple merge

diff --cc libavcodec/cbs_h264_syntax_template.c
Simple merge