diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:42:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-06 19:44:13 +0200 |
| commit | 3a29af4efc608d63bac72bf1572aff45cab22766 (patch) | |
| tree | 03c4d6b7891c052fe62be27542ca51474f3034c9 | |
| parent | d95a04547a3238aef9a344484c9c49b5d4681ccb (diff) | |
| parent | 02a7a5e330ec4373a761f63c292220a1de13b968 (diff) | |
| download | ffmpeg-3a29af4efc608d63bac72bf1572aff45cab22766.tar.gz | |
Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'
* commit '02a7a5e330ec4373a761f63c292220a1de13b968':
vc1test: Check malloc call
Conflicts:
libavformat/vc1test.c
See: a807c68253b02cce8b9fbc87d7857c31d531a1ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions