[FFmpeg-cvslog] Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 11 10:54:41 2013 +0200| [cbe47b1e8452e37fda592941e7d3f3bb5920c201] | committer: Michael Niedermayer

Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'

* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
  avformat: Use av_reallocp_array() where suitable

Conflicts:
	libavformat/asfenc.c
	libavformat/gxfenc.c
	libavformat/mov.c

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

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