Merge commit '3daaa4417317ca732fb00476fdb3308d784f87e4'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 02:18:43 +0000 (23:18 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Oct 2017 02:18:43 +0000 (23:18 -0300)
commita33490ca2874ed88ffb7cd325f7fc28a02c7c186
tree72dfe851f855241e2b34e400cfc29b2aa1c242f2
parenta7da13474286774cf378c3ea606c19a7c1a0eba3
parent3daaa4417317ca732fb00476fdb3308d784f87e4
Merge commit '3daaa4417317ca732fb00476fdb3308d784f87e4'

* commit '3daaa4417317ca732fb00476fdb3308d784f87e4':
  hevc: Add names for reserved NAL unit types
  h264_sei: Add namespace prefix to all SEI values

This commit is a noop, see
6eb102a616364d06a4cc994339b72910b3547e5f
b264810ef7a3fcd7cfc8e232877cfb2fdf7954f6

Merged-by: James Almer <jamrial@gmail.com>