Merge commit '5a2645cafe'
* commit '5a2645cafe': nutdec: Prevent leaks on memory error Conflicts: libavformat/nutdec.c See:269845db86Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8b3a681aaa