[FFmpeg-cvslog] Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Aug  2 12:32:10 2015 +0200| [190e52112339c62b213d7ccb0daab5ffe387af49] | committer: Hendrik Leppkes

Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'

* commit 'fdbc544d29176ba69d67dd879df4696f0a19052e':
  asfdec: prevent the memory leak while reading metadata

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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