Commit 880cee00 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '3035d21b'

* commit '3035d21b':
  nutdec: Check memory allocations

Conflicts:
	libavformat/nutdec.c

See: 55ae13e3
See: 269845dbMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 95165f7c 3035d21b
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