Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:42:33 +0000 (19:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Jul 2014 17:44:13 +0000 (19:44 +0200)
* commit '02a7a5e330ec4373a761f63c292220a1de13b968':
  vc1test: Check malloc call

Conflicts:
libavformat/vc1test.c

See: a807c68253b02cce8b9fbc87d7857c31d531a1ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge