Merge commit 'c42b62d1f9641f10ffc23cad9abbe47d8a4a165b'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:05:59 +0000 (14:05 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:05:59 +0000 (14:05 -0300)
* commit 'c42b62d1f9641f10ffc23cad9abbe47d8a4a165b':
  h264_metadata: Fix double-free
  cbs: Add buffer padding when splitting fragments
  cbs: Always check for bitstream end before reading

This commit is a noop, see
6734eef6b8b464139fdc140ec9bc9e8d74173869
b4c915f4b3e15c3e787e319b961e4389762f6309
a308872b049e33f69f4b629a06f47e3681906b93

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

Trivial merge