Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:46:59 +0000 (22:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:47:36 +0000 (22:47 +0100)
commit62aec0c2d5b3ee55dc376279307e31f0d72a7b03
treec4d4ace299ce1e7f4e13fa0680c88fc5f51da64f
parent7a7b77e6c97aabb654414044a000e8c4e9d52575
parentfe0f4e56577a2dbd373bb50b0ae2d49e69d822fc
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'

* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
  avpacket: Check buffer reference

Conflicts:
libavcodec/avpacket.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avpacket.c