Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:37:11 +0000 (05:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:37:26 +0000 (05:37 +0100)
* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
  imgconvert: check memory allocations and propagate errors

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

Simple merge