Merge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:27:01 +0000 (18:27 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:27:01 +0000 (18:27 -0300)
commit0dcfa02fd2788f243b8ae123467f3fbfd6587591
treec020fa7aa60dbbdca0ebff119f41ac483e49dd3a
parent78c52e2721cad97f4ac4a4a38c09e1cee2a4e7e2
parentbe9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d
Merge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'

* commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d':
  swscale: Properly load alpha for planar rgb

This commit is a noop, see
4170a44bbc7b8dfbe9fe2fa28557fce90d998887
df36257a53561a51af969a6ea6319dd2579509b9

Merged-by: James Almer <jamrial@gmail.com>