Merge commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 21:05:01 +0000 (23:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 21:05:01 +0000 (23:05 +0200)
* commit '4733a12dd17a91d606e0079ff9bb48b9f419cbef':
  rtpdec_asf: Check memory allocation and free memory on error

Conflicts:
libavformat/rtpdec_asf.c

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

No differences found