Commit fa321cc0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b4cda0a9'

* commit 'b4cda0a9':
  ogg: check memory allocations

Conflicts:
	libavformat/oggenc.c

See: 0f629823Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f3b6a8f5 b4cda0a9
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment