mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-04 04:00:46 +00:00
Merge commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4'
* commit 'b1fcdc08ceb5df69fac34aa0d57c56905d32b8b4':
nut: Fix unchecked allocations
Conflicts:
libavformat/nut.c
libavformat/nutdec.c
libavformat/nutenc.c
See: 55ae13e3de
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
078abccdd6