Commit 69505a89 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd9a542ac'

* commit 'd9a542ac':
  swscale: Set alpha to opaque for internal palettes.

Conflicts:
	libswscale/swscale_unscaled.c

See: dbfdb288Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 57570052 d9a542ac
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment