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

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