[FFmpeg-cvslog] Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  6 19:42:33 2014 +0200| [3a29af4efc608d63bac72bf1572aff45cab22766] | committer: Michael Niedermayer

Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'

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

Conflicts:
	libavformat/vc1test.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a29af4efc608d63bac72bf1572aff45cab22766
---