Merge commit '9b8d11a76ae7bca8bbb58abb822138f8b42c776c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 19:31:29 +0000 (20:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 19:31:29 +0000 (20:31 +0100)
commit8c677a9f06c5d145da0301cdc3c6bff9ebacb5d7
tree9c756ade47cc06771cb120f53b5f9c22724717f6
parent94a849b8b6c3e4a90361485b2e12a9a5c35833a3
parent9b8d11a76ae7bca8bbb58abb822138f8b42c776c
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>
libavcodec/bitstream.c
libavcodec/eatgv.c
libavcodec/flashsv.c
libavcodec/g2meet.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/libmp3lame.c
libavcodec/libschroedingerenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/shorten.c