diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-12 00:08:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-12 00:08:06 +0100 |
| commit | dadc1f5ee9d933cca94469604a15eb3d7bc939f0 (patch) | |
| tree | d72d4075d9092cced7cdf7f6b88889fb6e81735f /libavformat/webmdashenc.c | |
| parent | 1e16492b989e0f1bd262be6aaf5ebf7857f46dea (diff) | |
| parent | c9c7d59b7d26f0328d612995dd9256337ae1cbfb (diff) | |
Merge commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb'
* commit 'c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
tiff: Use av_mallocz_array
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webmdashenc.c')
0 files changed, 0 insertions, 0 deletions