Merge commit '69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:32:42 +0000 (22:32 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:37:07 +0000 (22:37 +0000)
commitfd76e7be70c10861567ebefd0bc6864f223fb017
tree7256a7b42d4522f5c3f914f6e4fde45009172faa
parent77eba7bd99355fc37a2bfc9d0224218f4022762c
parent69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb
Merge commit '69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb'

* commit '69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb':
  h264_metadata: Use common SEI addition function

Minor changes because the following patch is already present.

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