* commit '02a7a5e330ec4373a761f63c292220a1de13b968': vc1test: Check malloc call Conflicts: libavformat/vc1test.c See: a807c68253 Merged-by: Michael Niedermayer <michaelni@gmx.at>
a807c68253