Merge commit '96bfb677'

* commit '96bfb677':
  nutdec: Prevent a memory corruption

Conflicts:
	libavformat/nutdec.c

See: 05dd5368Merged-by: Michael Niedermayer <michaelni@gmx.at>