Commit 45660c7d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '59846452'

* commit '59846452':
  svq1enc: check ff_get_buffer return value

Conflicts:
	libavcodec/svq1enc.c

See: 7effc26bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 057b74d1 59846452
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