Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:21:22 +0000 (22:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:22:17 +0000 (22:22 +0100)
commit2a1b79d7e6596033618b23345aa24607f93e1614
tree147a8611b3eb40fdeb1c88f00377f755298d18a6
parent880cee004418b7067605cbd9e720aabb0a617164
parente51f22122d23589e93ac4f0b3e570bb925755915
Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'

* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
  swscale: Check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/utils.c