Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:08:46 +0000 (22:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:09:29 +0000 (22:09 +0100)
* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
  nutdec: Check memory allocations

Conflicts:
libavformat/nutdec.c

See: 55ae13e3deffa21027a44f31b4ae2f53a4fa7426
See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge