* commit '60392480':
  mem: fix pointer pointer aliasing violations

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