Michael Niedermayer 8c677a9f06 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@gmx.at>

2013-12-09 20:31:29 +01:00

16 KiB

Raw Blame History

View Raw