[FFmpeg-cvslog] Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 20 21:52:12 2014 +0200| [6ef4e0c8b899c4a79e028426707776df31bef09d] | committer: Michael Niedermayer

Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'

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

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

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