[FFmpeg-cvslog] Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun  5 11:19:16 2013 +0200| [30b491f1c99aa7992157791a98d6cdae6ca2e895] | committer: Michael Niedermayer

Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

Conflicts:
	doc/APIchanges
	libavformat/movenc.c
	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=30b491f1c99aa7992157791a98d6cdae6ca2e895
---