Commit 8895b71d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '29c455ce'

* commit '29c455ce':
  bitstream: Check the result of av_malloc()

Conflicts:
	libavcodec/bitstream.c

See: aa74810fMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 3a8b52c0 29c455ce
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