Commit 3a29af4e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '02a7a5e3'

* commit '02a7a5e3':
  vc1test: Check malloc call

Conflicts:
	libavformat/vc1test.c

See: a807c682Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d95a0454 02a7a5e3
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