diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:46:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:47:36 +0100 |
| commit | 62aec0c2d5b3ee55dc376279307e31f0d72a7b03 (patch) | |
| tree | c4d4ace299ce1e7f4e13fa0680c88fc5f51da64f /libavresample | |
| parent | 7a7b77e6c97aabb654414044a000e8c4e9d52575 (diff) | |
| parent | fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc (diff) | |
| download | ffmpeg-62aec0c2d5b3ee55dc376279307e31f0d72a7b03.tar.gz | |
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions