Merge commit '1d12a545ce828eaf4fb37295400008ea37635ab8'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:25:48 +0000 (21:25 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:25:48 +0000 (21:25 +0000)
commitcacb47633c043a4bafb6872716dd8c4479dc4df1
treeb3cce473c9aee7a019081c9b06501362fe778a16
parentd28eb0e34d80f12b779c7b6befc5b350ffcdf476
parent1d12a545ce828eaf4fb37295400008ea37635ab8
Merge commit '1d12a545ce828eaf4fb37295400008ea37635ab8'

* commit '1d12a545ce828eaf4fb37295400008ea37635ab8':
  cbs: Add an explicit type for coded bitstream unit types

Mostly already present from 6734eef6b8b464139fdc140ec9bc9e8d74173869, two
minor message changes are merged.

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/cbs_mpeg2.c