[FFmpeg-cvslog] Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  3 03:50:38 2015 +0200| [7755a5744005e93ea2f59b4f46066b4b9118e90a] | committer: Michael Niedermayer

Merge commit '9752d2e6cc9b9e8070ec515db8ed8374683d0856'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7755a5744005e93ea2f59b4f46066b4b9118e90a
---