* commit 'b4cda0a999facbddacb95861a67ff61074edc39b': ogg: check memory allocations Conflicts: libavformat/oggenc.c See: 0f62982335 Merged-by: Michael Niedermayer <michaelni@gmx.at>
0f62982335