Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:44:08 +0000 (21:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 20:44:50 +0000 (21:44 +0100)
commit90de28befd88fccb2a4d96d55e1d72eac96c4278
treee3adb9588f95486c67af56e5e6e06757c3883367
parentb20e79dbe99806d60ae856da830b9d866ffabcc6
parent1dd797e3c9f179f957316a0becbec048b42df8aa
Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'

* commit '1dd797e3c9f179f957316a0becbec048b42df8aa':
  swscale: check memory allocations

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