[FFmpeg-cvslog] Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 11:05:19 2013 +0200| [c74c3fb1420b847056d88b040a451c3c56286357] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c74c3fb1420b847056d88b040a451c3c56286357
---