Merge commit 'fa463aa83a4920b0eed47ad1f79775dfc53d21ec'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:48:03 +0000 (08:48 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:48:03 +0000 (08:48 +0100)
commit774c5357dbe62ba6017ecbe6738a73644cd5bb5d
tree80677504a16ef34877cce101fb92ad9b062123f7
parentbe3963c8af6e3eeb8ab061dcf2dfd5da158549bf
parentfa463aa83a4920b0eed47ad1f79775dfc53d21ec
Merge commit 'fa463aa83a4920b0eed47ad1f79775dfc53d21ec'

* commit 'fa463aa83a4920b0eed47ad1f79775dfc53d21ec':
  avpacket: fix size check in packet_alloc

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>