Commit 3377f6fd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8df5fbf0'

* commit '8df5fbf0':
  lcl: Check memory allocation

Conflicts:
	libavcodec/lclenc.c

See: 6dbcecd7Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 513673a8 8df5fbf0
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