]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit 'fdbc544d29176ba69d67dd879df4696f0a19052e':
  asfdec: prevent the memory leak while reading metadata

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

Simple merge