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)
commit649b2e4c8308c478d6c9fb892191121f12e3c0d3
tree1a0ad6a5b718a5174ff86296392f38530dfe2cae
parent4b6ccccb03ba23ddf5478235fb7bae2d1fe3e952
parent317cfaa5e09755ed0b34af512ec687963a67bdbf
Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf'

* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf':
  asfdec: prevent the memory leak in the asf_read_metada_obj

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