Merge commit '7244cefd6e6ba7258cb022dfd7a284099d88a3e8' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:14:16 +0000 (20:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 May 2015 18:15:15 +0000 (20:15 +0200)
commitd61022d55f1afe8ad05e883f43e186655e0769bb
tree06eb9b92a4d891f08b2f9db318418d4fe86ccb50
parent09764c9909bf1e0816bbf32f9f249b594a2d647b
parent7244cefd6e6ba7258cb022dfd7a284099d88a3e8
Merge commit '7244cefd6e6ba7258cb022dfd7a284099d88a3e8' into release/2.4

* commit '7244cefd6e6ba7258cb022dfd7a284099d88a3e8':
  libvpx: Fix mixed use of av_malloc() and av_reallocp()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libvpxenc.c