Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:50:38 +0000 (03:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:51:00 +0000 (03:51 +0200)
commit7755a5744005e93ea2f59b4f46066b4b9118e90a
tree963ed0cc72f8c0f02766619063d4d509e4ec8943
parenta8ab64d2f70029a87467f75d1412bf6d13664b64
parent9752d2e6cc9b9e8070ec515db8ed8374683d0856
Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'

* commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856':
  asfdec: prevent possible memory leak in the asf_read_metadata_obj

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asfdec_o.c