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)
commitc89751aa218c22e2d0febcafba4b01c533b8836e
tree9dc729cab5dd91a1277e6bc89295e6ff967d412f
parent8ccfafa7b41b8239cfbbaa5dfd8eea8a300c64be
parent210461c0a83a5625560fa1d92229200dc7fb869b
Merge commit '210461c0a83a5625560fa1d92229200dc7fb869b'

* commit '210461c0a83a5625560fa1d92229200dc7fb869b':
  imgconvert: check memory allocations and propagate errors

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