Merge commit 'a2ca8ed903b435446031a8a0792ca535e6ee2913'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:27:07 +0000 (22:27 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:27:07 +0000 (22:27 +0000)
* commit 'a2ca8ed903b435446031a8a0792ca535e6ee2913':
  cbs_h264: Add utility functions to insert/delete SEI messages

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

Simple merge
Simple merge