]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:35:56 +0000 (09:35 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:35:56 +0000 (09:35 +0200)
* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf':
  asfdec: prevent the memory leak in the asf_read_metada_obj

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

Simple merge