Merge commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:40:08 +0000 (22:40 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:40:08 +0000 (22:40 +0000)
commit7386b4ff39506b7a34b3689cc4b05993ed9b4a4f
tree940e9342b9b7bffa7107f150fd4b5c7064ee6fad
parent41317da325921d39834b65d8552a2ebb2f3e802b
parent78fa0b9033c0834c049e2aedf71a8c613fed87ab
Merge commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab'

* commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab':
  h264_metadata: Always add the SEI user data to the first access unit

Mostly already present from a308872b049e33f69f4b629a06f47e3681906b93,
one cosmetic change applied.

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