[FFmpeg-cvslog] Merge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  9 21:15:50 2015 +0100| [a11440c1857babc2c1184b83c19b9e66c9a6fe95] | committer: Michael Niedermayer

Merge commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8'

* commit '93f7948136fcda8ddbbc44a6c24418f11ca829b8':
  libvpx: Fix mixed use of av_malloc() and av_reallocp()

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

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