[FFmpeg-cvslog] Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 23:05:01 2015 +0200| [d5a645625d876288021d8192e4e3199087a753fc] | committer: Michael Niedermayer

Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'

* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
  rtpdec_asf: Check memory allocation and free memory on error

Conflicts:
	libavformat/rtpdec_asf.c

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

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