[FFmpeg-cvslog] Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 20:31:29 2013 +0100| [8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7] | committer: Michael Niedermayer

Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'

* commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c':
  avcodec: Use av_reallocp where suitable

Conflicts:
	libavcodec/bitstream.c
	libavcodec/eatgv.c
	libavcodec/flashsv.c
	libavcodec/libtheoraenc.c
	libavcodec/libvpxenc.c

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

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