Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f'
* commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f': oggdec: Check memory allocation Conflicts: libavformat/oggdec.c See: 9b8152bf047bbebe4495b993258591687bcdd36d an others Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
cff55cfe17