Commit cff55cfe authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '27aa1ff3'

* commit '27aa1ff3':
  oggdec: Check memory allocation

Conflicts:
	libavformat/oggdec.c

See: 9b8152bf an others
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c75681ab 27aa1ff3
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