Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:47:41 +0000 (09:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Oct 2013 07:48:20 +0000 (09:48 +0200)
commit078abccdd6dc3f173e3b420fa66e9b8859827b03
tree810641d11e003dfd211ddd6622d099d6ca3aa73a
parentd0f0ac426bdf95bc0cd152d8f2fc824cb7ddb7c5
parentb1fcdc08ceb5df69fac34aa0d57c56905d32b8b4
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'

* commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4':
  nut: Fix unchecked allocations

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

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