[FFmpeg-cvslog] Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 15 21:31:13 2015 +0100| [fa321cc0c8edabc790bcea41ceeecb226ed8d5a5] | committer: Michael Niedermayer

Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'

* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
	libavformat/oggenc.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa321cc0c8edabc790bcea41ceeecb226ed8d5a5
---