Merge commit 'a2ca8ed903b435446031a8a0792ca535e6ee2913'

* commit 'a2ca8ed903b435446031a8a0792ca535e6ee2913':
  cbs_h264: Add utility functions to insert/delete SEI messages

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

diff --cc libavcodec/cbs_h264.h
Simple merge

diff --cc libavcodec/cbs_h2645.c
Simple merge