mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-22 22:36:38 +00:00
Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'
* commit '02a7a5e330ec4373a761f63c292220a1de13b968':
vc1test: Check malloc call
Conflicts:
libavformat/vc1test.c
See: a807c68253
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3a29af4efc