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)
commitd5a645625d876288021d8192e4e3199087a753fc
tree22a73c8dd0e3288b64f78ff3862aa7940b759434
parent3d6635749ab2f3507a73cb450038118ae561d74c
parent4733a12dd17a91d606e0079ff9bb48b9f419cbef
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@gmx.at>
libavformat/rtpdec_asf.c