From: Mark Thompson Date: Wed, 21 Feb 2018 22:41:00 +0000 (+0000) Subject: Merge commit '7157d959264f3729da463725c6faa580d9394d19' X-Git-Tag: n4.1-dev~556 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/ab6edb173b365d9a787c2df3a45e3a018d7843d7 Merge commit '7157d959264f3729da463725c6faa580d9394d19' * commit '7157d959264f3729da463725c6faa580d9394d19': cbs_h264: Move slice_group_id array out of PPS structure Merged-by: Mark Thompson --- ab6edb173b365d9a787c2df3a45e3a018d7843d7