Merge commit '5420099cab1e915b191cceccec4364f54cec6e52'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 19:18:13 +0000 (21:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Aug 2014 19:18:17 +0000 (21:18 +0200)
commit8862c49661fb0655882a78547ca70561f2c5d766
treea0395080fdf4cc733f7317726d28bcd9201ff1bd
parent4e855c11b50b2f5b29cfd570d7cf7efeaff558d5
parent5420099cab1e915b191cceccec4364f54cec6e52
Merge commit '5420099cab1e915b191cceccec4364f54cec6e52'

* commit '5420099cab1e915b191cceccec4364f54cec6e52':
  swscale: correctly pad destination buffer in rgb conversion

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