Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 02:08:20 +0000 (03:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 02:08:20 +0000 (03:08 +0100)
commit8426edef4cf521104bb9288ac46a48dc4bdaee53
tree51a07cc48e411611ac25cd7e79f4850042a3cba5
parent7384ec19cf13fe204317c1b88333c58cbfa6336a
parent771656bd85416cd6308b11aed6f2c69a8db9c21b
Merge commit '771656bd85416cd6308b11aed6f2c69a8db9c21b'

* commit '771656bd85416cd6308b11aed6f2c69a8db9c21b':
  libvpxenc: clean memory on error

Conflicts:
libavcodec/libvpxenc.c

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