Merge commit '4d8c28deab2488579f585406110b1be790896e59'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:26:45 +0000 (02:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 00:27:35 +0000 (02:27 +0200)
commite222cfefcdcb496e47391b53f0391e9c3cb66397
tree6dd7c856584528283cae7c6f9d377e53e011e514
parente6a084641aada7a2e4672172f2ee26642800a361
parent4d8c28deab2488579f585406110b1be790896e59
Merge commit '4d8c28deab2488579f585406110b1be790896e59'

* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
libavutil/imgutils.c

See: 4d8c28deab2488579f585406110b1be790896e59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/imgutils.c