Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Oct 2014 20:35:15 +0000 (22:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Oct 2014 20:35:37 +0000 (22:35 +0200)
* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
  nutdec: Prevent a memory corruption

Conflicts:
libavformat/nutdec.c

See: 05dd5368a92718f3a25f97f4697acffbabc7458f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nutdec.c

Simple merge