Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 23:44:27 +0000 (01:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 23:44:27 +0000 (01:44 +0200)
* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801':
  swscale: Set alpha to opaque for internal palettes.

Conflicts:
libswscale/swscale_unscaled.c

See: dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge