Merge commit 'b4cda0a999'
* commit 'b4cda0a999': ogg: check memory allocations Conflicts: libavformat/oggenc.c See:0f62982335Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
fa321cc0c8