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)
* commit '7ebb3022297aa00afda6800105684b8303f2608e':
  swscale: Check memory allocation

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

Simple merge