Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Oct 2014 19:52:12 +0000 (21:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Oct 2014 19:52:51 +0000 (21:52 +0200)
commit6ef4e0c8b899c4a79e028426707776df31bef09d
tree76739e71266c5668964f3462420b5e09e3dd7dab
parentc04f125bb42a0aca1498612f5674ee3d3342f720
parent7b48bf95242ebf95366d24d32e4cfca6aa77c5e2
Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'

* commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2':
  wtv: clean memory on error

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