Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:32:10 +0000 (12:32 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 10:32:10 +0000 (12:32 +0200)
commit190e52112339c62b213d7ccb0daab5ffe387af49
tree982dd45610733f5144cba0997ac20ab7d8ccbdff
parent1ce298dac51cb948a7170ed28e8290530cf150f4
parentfdbc544d29176ba69d67dd879df4696f0a19052e
Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfdec_o.c