Merge commit '02a7a5e330'
* commit '02a7a5e330': vc1test: Check malloc call Conflicts: libavformat/vc1test.c See:a807c68253Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3a29af4efc