Merge commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:58:05 +0000 (01:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:58:44 +0000 (01:58 +0200)
* commit '7ca603f96f93d988e01d161d611f69a4ecaa3f02':
  jpegls: Check memory allocation

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

Simple merge