diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:08:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 22:09:29 +0100 |
| commit | 880cee004418b7067605cbd9e720aabb0a617164 (patch) | |
| tree | 5fae0d4cf48e0cfad5df4ca978187e509452cad0 /libswscale | |
| parent | 95165f7c1b533c121b890fa1e82e8ed596cfc108 (diff) | |
| parent | 3035d21b5a77df0e9531df397fc06d59488996c7 (diff) | |
Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'
* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
nutdec: Check memory allocations
Conflicts:
libavformat/nutdec.c
See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions