Merge commit 'aa498c3183236a93206b4a0e8225b9db0660b50d'
authorJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 17:51:46 +0000 (14:51 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 17:51:46 +0000 (14:51 -0300)
* commit 'aa498c3183236a93206b4a0e8225b9db0660b50d':
  avpacket: fix leak on realloc in av_packet_add_side_data()

This commit is a noop, see 574929d8b6de32ae712fcca7ab09f01a3e4616be

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

Trivial merge