Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'

* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
  nutdec: Prevent leaks on memory error

Conflicts:
	libavformat/nutdec.c

See: 269845db86
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/125/head
Michael Niedermayer 10 years ago
commit 8b3a681aaa

Diff Content Not Available