Michael Niedermayer c74c3fb142 Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7' ...

* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
  mem: Introduce av_reallocp

Conflicts:
	doc/APIchanges
	libavutil/mem.c
	libavutil/mem.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-09-17 11:06:26 +02:00

13 KiB

Raw Blame History

View Raw