Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:31:13 +0000 (21:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:34:06 +0000 (21:34 +0100)
* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
libavformat/oggenc.c

See: 0f629823355680802320ee7be52af7f4e1b3e0b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge