]> git.sesse.net Git - ffmpeg/commitdiff
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)
* 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>

Trivial merge