Merge commit '8965e2af921ec5926b26d5ae466ee4104bb5262b'
authorJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:47:47 +0000 (22:47 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 12 Feb 2018 01:47:47 +0000 (22:47 -0300)
commit6c59f05c74d87b169bd9775e6a399ed298742137
tree13f943fe2c1212e27d3bdac766c19d9b7cf39fee
parentd0f098a5e0bae84d98eb48ea5ba173422e004fe3
parent8965e2af921ec5926b26d5ae466ee4104bb5262b
Merge commit '8965e2af921ec5926b26d5ae466ee4104bb5262b'

* commit '8965e2af921ec5926b26d5ae466ee4104bb5262b':
  avpacket: Initialize the allocated padding area in side data

This commit is a noop, see 9cbb3fce5965f4e1423cace3d1dc340a7a8091f4

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