diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 02:26:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 02:27:35 +0200 |
| commit | e222cfefcdcb496e47391b53f0391e9c3cb66397 (patch) | |
| tree | 6dd7c856584528283cae7c6f9d377e53e011e514 | |
| parent | e6a084641aada7a2e4672172f2ee26642800a361 (diff) | |
| parent | 4d8c28deab2488579f585406110b1be790896e59 (diff) | |
| download | ffmpeg-e222cfefcdcb496e47391b53f0391e9c3cb66397.tar.gz | |
Merge commit '4d8c28deab2488579f585406110b1be790896e59'
* commit '4d8c28deab2488579f585406110b1be790896e59':
imgutils: make systematic palette opaque.
Conflicts:
libavutil/imgutils.c
See: 4d8c28deab2488579f585406110b1be790896e59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/imgutils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index d8a579fc62..274099b75f 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -181,7 +181,7 @@ int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt) default: return AVERROR(EINVAL); } - pal[i] = b + (g<<8) + (r<<16) + (0xFFU<<24); + pal[i] = b + (g << 8) + (r << 16) + (0xFFU << 24); } return 0; |