diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:13:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:13:52 +0200 |
| commit | 32365667ccebab599eabf5f99ed0cdea20d29750 (patch) | |
| tree | 65aa1500d66f5040363fa8f94dc9206b8bb19506 /tools/enum_options.c | |
| parent | efec730431848bc0f3bf86d58ac838ca6594b62d (diff) | |
| parent | 73953df71a28e94d8959facba7906cf5975ca4ef (diff) | |
| download | ffmpeg-32365667ccebab599eabf5f99ed0cdea20d29750.tar.gz | |
Merge commit '73953df71a28e94d8959facba7906cf5975ca4ef'
* commit '73953df71a28e94d8959facba7906cf5975ca4ef':
Replace av_malloc() and memset(0) by av_mallocz()
Conflicts:
libavformat/matroskadec.c
libavformat/rmdec.c
libavformat/utils.c
No change, as none of the split malloc+memset existed in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/enum_options.c')
0 files changed, 0 insertions, 0 deletions