Commit 078abccd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b1fcdc08'

* commit 'b1fcdc08':
  nut: Fix unchecked allocations

Conflicts:
	libavformat/nut.c
	libavformat/nutdec.c
	libavformat/nutenc.c

See: 55ae13e3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d0f0ac42 b1fcdc08
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