Merge commit '60392480181f24ebf3ab48d8ac3614705de90152'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Feb 2015 12:52:22 +0000 (13:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Feb 2015 12:52:22 +0000 (13:52 +0100)
commitfa73358c9bfd3cb433c6f31a31fc4128c762d809
tree1eab3942152096fde24c4e69301b7e7f4d7f3ded
parent9bacb576bcdfc86473c04dba8296426fe185ad07
parent60392480181f24ebf3ab48d8ac3614705de90152
Merge commit '60392480181f24ebf3ab48d8ac3614705de90152'

* commit '60392480181f24ebf3ab48d8ac3614705de90152':
  mem: fix pointer pointer aliasing violations

Conflicts:
libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/mem.c