Merge commit '7ebb3022297aa00afda6800105684b8303f2608e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 02:40:17 +0000 (03:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Mar 2015 02:40:37 +0000 (03:40 +0100)
commit324067d18bf23993855c4fc59f947488e9854ed7
tree4de25a0dc7c3fe3216430a0a99e91d9581e4d61f
parent0346783c9886f7d86a12ad9ed20d768a308f5da2
parent7ebb3022297aa00afda6800105684b8303f2608e
Merge commit '7ebb3022297aa00afda6800105684b8303f2608e'

* commit '7ebb3022297aa00afda6800105684b8303f2608e':
  swscale: Check memory allocation

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