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)
* commit '7157d959264f3729da463725c6faa580d9394d19':
  cbs_h264: Move slice_group_id array out of PPS structure

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

Simple merge
Simple merge
Simple merge