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)
commit3a29af4efc608d63bac72bf1572aff45cab22766
tree03c4d6b7891c052fe62be27542ca51474f3034c9
parentd95a04547a3238aef9a344484c9c49b5d4681ccb
parent02a7a5e330ec4373a761f63c292220a1de13b968
Merge commit '02a7a5e330ec4373a761f63c292220a1de13b968'

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

Conflicts:
libavformat/vc1test.c

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