diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-01 13:52:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-01 13:52:22 +0100 |
| commit | fa73358c9bfd3cb433c6f31a31fc4128c762d809 (patch) | |
| tree | 1eab3942152096fde24c4e69301b7e7f4d7f3ded /libavformat/metadata.h | |
| parent | 9bacb576bcdfc86473c04dba8296426fe185ad07 (diff) | |
| parent | 60392480181f24ebf3ab48d8ac3614705de90152 (diff) | |
| download | ffmpeg-fa73358c9bfd3cb433c6f31a31fc4128c762d809.tar.gz | |
Merge commit '60392480181f24ebf3ab48d8ac3614705de90152'
* commit '60392480181f24ebf3ab48d8ac3614705de90152':
mem: fix pointer pointer aliasing violations
Conflicts:
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/metadata.h')
0 files changed, 0 insertions, 0 deletions