[FFmpeg-cvslog] Merge commit '5626f994f273af80fb100d4743b963304de9e05c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 19 11:01:26 2013 +0200| [20dfab33f5ab61fc51de65192ed239f8b62782a2] | committer: Michael Niedermayer

Merge commit '5626f994f273af80fb100d4743b963304de9e05c'

* commit '5626f994f273af80fb100d4743b963304de9e05c':
  avformat: Use av_reallocp() where suitable

Conflicts:
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/aviobuf.c
	libavformat/oggparsevorbis.c
	libavformat/utils.c

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

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