Commit 8b3a681a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5a2645ca'

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

Conflicts:
	libavformat/nutdec.c

See: 269845dbMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 98c387c9 5a2645ca
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment